From 7482c80285084e21046703f3689818699cbf7f3b Mon Sep 17 00:00:00 2001 From: Niels Dekker Date: Thu, 15 Sep 2022 10:01:14 +0200 Subject: [PATCH] STYLE: Remove unreachable code from GE5ImageIO `if (buffer == nullptr)` In C++, `new char[N]` does not return a `nullptr`, it might just throw an `std::bad_alloc` exception, in case of allocation failure. So there is no need to do something like "if (buffer == nullptr) clean up and throw an exception". --- Modules/IO/GE/src/itkGE5ImageIO.cxx | 30 ----------------------------- 1 file changed, 30 deletions(-) diff --git a/Modules/IO/GE/src/itkGE5ImageIO.cxx b/Modules/IO/GE/src/itkGE5ImageIO.cxx index 21c145552f4..a43c5625afb 100644 --- a/Modules/IO/GE/src/itkGE5ImageIO.cxx +++ b/Modules/IO/GE/src/itkGE5ImageIO.cxx @@ -255,22 +255,12 @@ GE5ImageIO::ReadHeader(const char * FileNameToRead) if (pixelHdrFlag) { buffer = new char[imageHdr.GENESIS_IH_img_l_exam]; - if (buffer == nullptr) - { - f.close(); - itkExceptionMacro("GE5ImageIO:Unable to allocate memory for exam header!"); - } f.seekg(imageHdr.GENESIS_IH_img_p_exam, std::ios::beg); f.read(buffer, imageHdr.GENESIS_IH_img_l_exam); } else { buffer = new char[GENESIS_EX_HDR_LEN]; - if (buffer == nullptr) - { - f.close(); - itkExceptionMacro("GE5ImageIO:Unable to allocate memory for exam header!"); - } f.seekg(GENESIS_EX_HDR_START, std::ios::beg); f.read(buffer, GENESIS_EX_HDR_LEN); } @@ -314,22 +304,12 @@ GE5ImageIO::ReadHeader(const char * FileNameToRead) if (pixelHdrFlag) { buffer = new char[imageHdr.GENESIS_IH_img_l_series]; - if (buffer == nullptr) - { - f.close(); - itkExceptionMacro("GE5ImageIO:Unable to allocate memory for series header!"); - } f.seekg(imageHdr.GENESIS_IH_img_p_series, std::ios::beg); f.read(buffer, imageHdr.GENESIS_IH_img_l_series); } else { buffer = new char[GENESIS_SE_HDR_LEN]; - if (buffer == nullptr) - { - f.close(); - itkExceptionMacro("GE5ImageIO:Unable to allocate memory for series header!"); - } f.seekg(GENESIS_SE_HDR_START); f.read(buffer, GENESIS_SE_HDR_LEN); } @@ -351,11 +331,6 @@ GE5ImageIO::ReadHeader(const char * FileNameToRead) if (pixelHdrFlag) { buffer = new char[imageHdr.GENESIS_IH_img_l_image]; - if (buffer == nullptr) - { - f.close(); - itkExceptionMacro("GE5ImageIO:Unable to allocate memory for MR header!"); - } // Now seek to the MR header and read the data into the buffer. f.seekg(imageHdr.GENESIS_IH_img_p_image, std::ios::beg); f.read(buffer, imageHdr.GENESIS_IH_img_l_image); @@ -363,11 +338,6 @@ GE5ImageIO::ReadHeader(const char * FileNameToRead) else { buffer = new char[GENESIS_MR_HDR_LEN]; - if (buffer == nullptr) - { - f.close(); - itkExceptionMacro("GE5ImageIO:Unable to allocate memory for MR header!"); - } f.seekg(GENESIS_IM_HDR_START, std::ios::beg); f.read(buffer, GENESIS_MR_HDR_LEN); }