Merge pull request #3917 from cgohlke/patch-2

Fix potential null pointer is passed into memcpy
python-pillow · Jun 26, 2019 · f2d0106 · f2d0106
2 parents 2aaacc8 + a78341e
commit f2d0106
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/libImaging/TiffDecode.c b/src/libImaging/TiffDecode.c
@@ -194,6 +194,9 @@ int ReadTile(TIFF* tiff, UINT32 col, UINT32 row, UINT32* buffer) {
         }
 
         swap_line = (UINT32*)malloc(swap_line_size);
+        if (swap_line == NULL) {
+            return -1;
+        }
         /*
          * For some reason the TIFFReadRGBATile() function chooses the
          * lower left corner as the origin.  Vertically mirror scanlines.