Merge branch 'PHP-5.6' into PHP-7.0

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

diff --cc ext/exif/exif.c
index f0c631e07b12fbc4fc4e844c321c18db7043f80f,8b0e34c10dc8a04b8e81d9d79985b2566141b03d..86cf1733012b33325cc47afb1962632dd000de61
--- 1/ext/exif/exif.c
--- 2/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)
 -                                                                              exif_thumbnail_build(ImageInfo TSRMLS_CC);
+                                                                               efree(ImageInfo->Thumbnail.data);
+                                                                               ImageInfo->Thumbnail.data = NULL;
+                                                                       } else {
++                                                                              exif_thumbnail_build(ImageInfo);
                                                                        }
-                                                                       exif_thumbnail_build(ImageInfo);
                                                                }
                                                        }
                                                }