com php-src: Same issue as #72926 in another place.: ext/exif/exif.c
| From: | Stanislav Malyshev | Date: | Mon, 05 Sep 2016 03:49:34 +0000 |
| Subject: | com php-src: Same issue as #72926 in another place.: ext/exif/exif.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-94296@lists.php.net to get a copy of this message | ||
Commit: b578580e888bf5ab3064a519deda9fd47bf00275
Author: Stanislav Malyshev <stas@php.net> Sun, 4 Sep 2016 20:49:34 -0700
Parents: d1fbc98ff644ead86262497af2febc8ccb6bf401
Branches: PHP-5.6 PHP-7.0 PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b578580e888bf5ab3064a519deda9fd47bf00275
Log:
Same issue as #72926 in another place.
Bugs:
https://bugs.php.net/72926
Changed paths:
M ext/exif/exif.c
Diff:
diff --git a/ext/exif/exif..c b/ext/exif/exif.c
index 657a2cc..8b0e34c 100644
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -3734,8 +3734,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);
}
}
}