fix memory leak in RgbaInputFile constructor (#1221)

Signed-off-by: Peter Hillman <[email protected]>
AcademySoftwareFoundation · Jan 19, 2022 · aeaf98f · aeaf98f
1 parent 434776b
commit aeaf98f
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/src/lib/OpenEXR/ImfRgbaFile.cpp b/src/lib/OpenEXR/ImfRgbaFile.cpp
@@ -1174,12 +1174,13 @@ RgbaInputFile::RgbaInputFile (OPENEXR_IMF_INTERNAL_NAMESPACE::IStream &is,
 
 RgbaInputFile::RgbaInputFile (int partNumber, const char name[], int numThreads) :
     _multiPartFile (new MultiPartInputFile (name, numThreads)),
-    _inputPart(new InputPart(*_multiPartFile,partNumber)),
+    _inputPart (nullptr),
     _fromYca (nullptr),
     _channelNamePrefix ("")
 {
     try
     {
+       _inputPart = new InputPart(*_multiPartFile,partNumber);
        RgbaChannels rgbaChannels = channels();
        if (rgbaChannels & WRITE_C)
 	  _fromYca = new FromYca (*_inputPart, rgbaChannels);
@@ -1200,12 +1201,13 @@ RgbaInputFile::RgbaInputFile (int partNumber, const char name[], int numThreads)
 
 RgbaInputFile::RgbaInputFile (int partNumber, OPENEXR_IMF_INTERNAL_NAMESPACE::IStream &is, int numThreads) :
      _multiPartFile (new MultiPartInputFile (is, numThreads)),
-    _inputPart(new InputPart(*_multiPartFile,partNumber)),
+     _inputPart(nullptr),
     _fromYca (nullptr),
     _channelNamePrefix ("")
 {
     try
     {
+      _inputPart = new InputPart(*_multiPartFile,partNumber);
        RgbaChannels rgbaChannels = channels();
        if (rgbaChannels & WRITE_C)
 	  _fromYca = new FromYca (*_inputPart, rgbaChannels);
@@ -1229,12 +1231,13 @@ RgbaInputFile::RgbaInputFile (int partNumber,
 			      int numThreads)
 :
     _multiPartFile (new MultiPartInputFile (name, numThreads)),
-    _inputPart( new InputPart(*_multiPartFile,partNumber)),
-    _fromYca (0),
-    _channelNamePrefix (prefixFromLayerName (layerName, _inputPart->header()))
+    _inputPart (nullptr),
+    _fromYca (0)
 {
     try
     {
+        _inputPart = new InputPart(*_multiPartFile,partNumber);
+        _channelNamePrefix = prefixFromLayerName (layerName, _inputPart->header());
          RgbaChannels rgbaChannels = channels();
 
          if (rgbaChannels & WRITE_C)
@@ -1258,12 +1261,13 @@ RgbaInputFile::RgbaInputFile (int partNumber,
 			      int numThreads)
 :
     _multiPartFile (new MultiPartInputFile (is, numThreads)),
-    _inputPart( new InputPart(*_multiPartFile,partNumber)),
-    _fromYca (0),
-    _channelNamePrefix (prefixFromLayerName (layerName, _inputPart->header()))
+    _inputPart(nullptr),
+    _fromYca (0)
 {
     try
     {
+       _inputPart = new InputPart(*_multiPartFile,partNumber);
+       _channelNamePrefix = prefixFromLayerName (layerName, _inputPart->header());
        RgbaChannels rgbaChannels = channels();
 
        if (rgbaChannels & WRITE_C)