com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/exif/exif.c

From: Date: Mon, 05 Sep 2016 03:57:46 +0000
Subject: com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/exif/exif.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-94294@lists.php.net to get a copy of this message
Commit: a2fdf0f4135f5a29e613c1c6c53d378dc6ff7bed Author: Stanislav Malyshev <stas@php.net> Sun, 4 Sep 2016 20:57:46 -0700 Parents: c3dfe57c23cb88e1adb06ce05ef60eacafa86aa3 b578580e888bf5ab3064a519deda9fd47bf00275 Branches: PHP-7.0 PHP-7.1 master Link: http://git.php..net/?p=php-src.git;a=commitdiff;h=a2fdf0f4135f5a29e613c1c6c53d378dc6ff7bed Log: Merge branch 'PHP-5.6' into PHP-7.0 * PHP-5.6: Same issue as #72926 in another place. Bugs: https://bugs.php.net/72926 Changed paths: MM ext/exif/exif.c Diff: diff --cc ext/exif/exif.c index f0c631e,8b0e34c..86cf173 --- 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); } } }

« previous php.cvs (#94294) next »