diff options
| author | Remi Collet <fedora@famillecollet.com> | 2016-09-19 15:47:58 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2016-09-19 15:47:58 +0200 |
| commit | 52386b6e0fcffedfeb59435fee398e30dd859fcf (patch) | |
| tree | df5fe9324ace1f6c6e5d7707d46c42269613f903 /bug72926.patch | |
| parent | 009ea0a2144e7f78907c4d9cec1d94652921161d (diff) | |
PHP 5.4.45 with "some" backports from 5.6.26
Diffstat (limited to 'bug72926.patch')
| -rw-r--r-- | bug72926.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/bug72926.patch b/bug72926.patch new file mode 100644 index 0000000..044ed2b --- /dev/null +++ b/bug72926.patch @@ -0,0 +1,29 @@ +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); + } + } + } |