fix potential io streams leak in case of exceptions during 'initializ…

…e' function
AcademySoftwareFoundation · Aug 8, 2018 · 19bac86 · 19bac86
1 parent 60cc8b7
commit 19bac86
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.cpp b/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.cpp
@@ -836,6 +836,7 @@ DeepScanLineOutputFile::DeepScanLineOutputFile
     }
     catch (IEX_NAMESPACE::BaseExc &e)
     {
+        delete _data->_streamData->os;
         delete _data->_streamData;
         delete _data;
 
@@ -845,6 +846,7 @@ DeepScanLineOutputFile::DeepScanLineOutputFile
     }
     catch (...)
     {
+        delete _data->_streamData->os;
         delete _data->_streamData;
         delete _data;
         throw;

diff --git a/OpenEXR/IlmImf/ImfMultiPartInputFile.cpp b/OpenEXR/IlmImf/ImfMultiPartInputFile.cpp
@@ -137,6 +137,7 @@ MultiPartInputFile::MultiPartInputFile(const char fileName[],
     }
     catch (IEX_NAMESPACE::BaseExc &e)
     {
+        delete _data->is;
         delete _data;
 
         REPLACE_EXC (e, "Cannot read image file "
@@ -145,6 +146,7 @@ MultiPartInputFile::MultiPartInputFile(const char fileName[],
     }
     catch (...)
     {
+        delete _data->is;
         delete _data;
         throw;
     }

diff --git a/OpenEXR/IlmImf/ImfMultiPartOutputFile.cpp b/OpenEXR/IlmImf/ImfMultiPartOutputFile.cpp
@@ -226,6 +226,7 @@ MultiPartOutputFile::MultiPartOutputFile (const char fileName[],
     }
     catch (IEX_NAMESPACE::BaseExc &e)
     {
+        delete _data->os;
         delete _data;
 
         REPLACE_EXC (e, "Cannot open image file "
@@ -234,6 +235,7 @@ MultiPartOutputFile::MultiPartOutputFile (const char fileName[],
     }
     catch (...)
     {
+        delete _data->os;
         delete _data;
         throw;
     }

diff --git a/OpenEXR/IlmImf/ImfOutputFile.cpp b/OpenEXR/IlmImf/ImfOutputFile.cpp
@@ -678,17 +678,19 @@ OutputFile::OutputFile
     }
     catch (IEX_NAMESPACE::BaseExc &e)
     {
-        if (_data && _data->_streamData) delete _data->_streamData;
-	if (_data)       delete _data;
+        delete _data->_streamData->os;
+        delete _data->_streamData;
+        delete _data;
 
 	REPLACE_EXC (e, "Cannot open image file "
 			"\"" << fileName << "\". " << e);
 	throw;
     }
     catch (...)
     {
-        if (_data && _data->_streamData) delete _data->_streamData;
-        if (_data)       delete _data;
+        delete _data->_streamData->os;
+        delete _data->_streamData;
+	delete _data;
 
         throw;
     }

diff --git a/OpenEXR/IlmImf/ImfTiledOutputFile.cpp b/OpenEXR/IlmImf/ImfTiledOutputFile.cpp
@@ -876,6 +876,7 @@ TiledOutputFile::TiledOutputFile
     }
     catch (IEX_NAMESPACE::BaseExc &e)
     {
+        delete _streamData->os;
         delete _streamData;
 	delete _data;
 
@@ -885,6 +886,7 @@ TiledOutputFile::TiledOutputFile
     }
     catch (...)
     {
+        delete _streamData->os;
         delete _streamData;
 	delete _data;
         throw;