apply AcademySoftwareFoundation#825: Avoid overflow in calculateNumTi…

…les when size=MAX_INT Signed-off-by: Peter Hillman <[email protected]>
peterhillman · Dec 6, 2020 · 10b1c6a · 10b1c6a
1 parent 1632a37
commit 10b1c6a
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/OpenEXR/IlmImf/ImfTiledMisc.cpp b/OpenEXR/IlmImf/ImfTiledMisc.cpp
@@ -301,10 +301,8 @@ calculateNumTiles (int *numTiles,
 {
     for (int i = 0; i < numLevels; i++)
     {
-        int l = levelSize (min, max, i, rmode);
-        if (l > std::numeric_limits<int>::max() - size + 1)
-            throw IEX_NAMESPACE::ArgExc ("Invalid size.");
-
+        // use 64 bits to avoid int overflow if size is large.
+        Int64 l = levelSize (min, max, i, rmode);
         numTiles[i] = (l + size - 1) / size;
     }
 }