fix crash with damaged EXR files (#656)

Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
AcademySoftwareFoundation · Feb 8, 2020 · 3422b34 · 3422b34
1 parent 5754217
commit 3422b34
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/OpenEXR/IlmImf/ImfScanLineInputFile.cpp b/OpenEXR/IlmImf/ImfScanLineInputFile.cpp
@@ -1181,8 +1181,11 @@ ScanLineInputFile::ScanLineInputFile(InputPartData* part)
         {
             for (size_t i = 0; i < _data->lineBuffers.size(); i++)
             {
-                EXRFreeAligned(_data->lineBuffers[i]->buffer);
-                _data->lineBuffers[i]->buffer=nullptr;
+                if( _data->lineBuffers[i] )
+                {
+                   EXRFreeAligned(_data->lineBuffers[i]->buffer);
+                   _data->lineBuffers[i]->buffer=nullptr;
+                }
             }
         }
 
@@ -1234,11 +1237,14 @@ ScanLineInputFile::ScanLineInputFile
         {
            if (!_data->memoryMapped)
            {
-             for (size_t i = 0; i < _data->lineBuffers.size(); i++)
-             {
-                 EXRFreeAligned(_data->lineBuffers[i]->buffer);
-                 _data->lineBuffers[i]->buffer=nullptr;
-             }
+              for (size_t i = 0; i < _data->lineBuffers.size(); i++)
+              {
+                 if( _data->lineBuffers[i] )
+                 {
+                   EXRFreeAligned(_data->lineBuffers[i]->buffer);
+                   _data->lineBuffers[i]->buffer=nullptr;
+                 }
+              }
            }
         }
         delete _streamData;