free memory if precalculateTileInfo throws

Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
AcademySoftwareFoundation · Aug 12, 2020 · 425c104 · 425c104
1 parent 7212e33
commit 425c104
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 30 deletions.
diff --git a/OpenEXR/IlmImf/ImfMultiPartInputFile.cpp b/OpenEXR/IlmImf/ImfMultiPartInputFile.cpp
@@ -451,25 +451,37 @@ MultiPartInputFile::Data::createTileOffsets(const Header& header)
     // Precompute level and tile information
     //
 
-    int* numXTiles;
-    int* numYTiles;
+    int* numXTiles = nullptr;
+    int* numYTiles = nullptr;
     int numXLevels, numYLevels;
     TileDescription tileDesc = header.tileDescription();
-    precalculateTileInfo (tileDesc,
-                          minX, maxX,
-                          minY, maxY,
-                          numXTiles, numYTiles,
-                          numXLevels, numYLevels);
-
-    TileOffsets* tileOffsets = new TileOffsets (tileDesc.mode,
-                                                numXLevels,
-                                                numYLevels,
-                                                numXTiles,
-                                                numYTiles);
-    delete [] numXTiles;
-    delete [] numYTiles;
-
-    return tileOffsets;
+    try
+    {
+
+        precalculateTileInfo (tileDesc,
+                            minX, maxX,
+                            minY, maxY,
+                            numXTiles, numYTiles,
+                            numXLevels, numYLevels);
+
+        TileOffsets* tileOffsets = new TileOffsets (tileDesc.mode,
+                                                    numXLevels,
+                                                    numYLevels,
+                                                    numXTiles,
+                                                    numYTiles);
+        delete [] numXTiles;
+        delete [] numYTiles;
+
+        return tileOffsets;
+
+    }
+    catch(...)
+    {
+        delete [] numXTiles;
+        delete [] numYTiles;
+        throw;
+    }
+
 }
 
 

diff --git a/OpenEXR/IlmImf/ImfTiledMisc.cpp b/OpenEXR/IlmImf/ImfTiledMisc.cpp
@@ -352,23 +352,23 @@ getTiledChunkOffsetTableSize(const Header& header)
     // Precompute level and tile information.
     //
 
-    int* numXTiles;
-    int* numYTiles;
+    int* numXTiles=nullptr;
+    int* numYTiles=nullptr;
     int numXLevels;
     int numYLevels;
-    precalculateTileInfo (header.tileDescription(),
-                          dataWindow.min.x, dataWindow.max.x,
-                          dataWindow.min.y, dataWindow.max.y,
-                          numXTiles, numYTiles,
-                          numXLevels, numYLevels);
-
-    //
-    // Calculate lineOffsetSize.
-    //
-    Int64 lineOffsetSize = 0;
-    const TileDescription &desc = header.tileDescription();
     try
     {
+        precalculateTileInfo (header.tileDescription(),
+                            dataWindow.min.x, dataWindow.max.x,
+                            dataWindow.min.y, dataWindow.max.y,
+                            numXTiles, numYTiles,
+                            numXLevels, numYLevels);
+
+        //
+        // Calculate lineOffsetSize.
+        //
+        Int64 lineOffsetSize = 0;
+        const TileDescription &desc = header.tileDescription();
         switch (desc.mode)
         {
             case ONE_LEVEL: