blob: 044ed2b160a3e3a390cb20026e868ceccefff901 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
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);
}
}
}
|
