From: Stanislav Malyshev <stas@php.net>
Date: Mon, 5 Sep 2016 03:57:46 +0000 (-0700)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.0RC2~56^2~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a2fdf0f4135f5a29e613c1c6c53d378dc6ff7bed;p=php

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Same issue as #72926 in another place.
---

a2fdf0f4135f5a29e613c1c6c53d378dc6ff7bed
diff --cc ext/exif/exif.c
index f0c631e07b,8b0e34c10d..86cf173301
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@@ -3723,8 -3734,11 +3723,11 @@@ static int exif_process_IFD_in_TIFF(ima
  									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);
  									}
- 									exif_thumbnail_build(ImageInfo);
  								}
  							}
  						}