30 lines
1003 B
Diff
30 lines
1003 B
Diff
Backported from 5.6.26 by Remi.
|
|
|
|
|
|
From 88d26623b2e55becc1d4b3e7944ebb1a0c1bd908 Mon Sep 17 00:00:00 2001
|
|
From: Stanislav Malyshev <stas@php.net>
|
|
Date: Sun, 4 Sep 2016 20:49:34 -0700
|
|
Subject: [PATCH] Same issue as #72926 in another place.
|
|
|
|
---
|
|
ext/exif/exif.c | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/ext/exif/exif.c b/ext/exif/exif.c
|
|
index 657a2cc1..8b0e34c 100644
|
|
--- a/ext/exif/exif.c
|
|
+++ b/ext/exif/exif.c
|
|
@@ -3744,8 +3744,11 @@ static int exif_process_IFD_in_TIFF(image_info_type *ImageInfo, size_t dir_offse
|
|
fgot = php_stream_read(ImageInfo->infile, ImageInfo->Thumbnail.data, ImageInfo->Thumbnail.size);
|
|
if (fgot < ImageInfo->Thumbnail.size) {
|
|
EXIF_ERRLOG_THUMBEOF(ImageInfo)
|
|
+ efree(ImageInfo->Thumbnail.data);
|
|
+ ImageInfo->Thumbnail.data = NULL;
|
|
+ } else {
|
|
+ exif_thumbnail_build(ImageInfo TSRMLS_CC);
|
|
}
|
|
- exif_thumbnail_build(ImageInfo TSRMLS_CC);
|
|
}
|
|
}
|
|
}
|
