com php-src: Fixed bug #72627: Memory Leakage In exif_process _IFD_in_TIFF: ext/exif/exif.c ext/exif/tests/bug 72627.phpt ext/exif/tests/bug72627.ti
ff
| From: | Ferenc Kovacs | Date: | Thu, 18 Aug 2016 10:52:15 +0000 |
| Subject: | com php-src: Fixed bug #72627: Memory Leakage In exif_process _IFD_in_TIFF: ext/exif/exif.c ext/exif/tests/bug 72627.phpt ext/exif/tests/bug72627.ti ff |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93952@lists.php.net to get a copy of this message | ||
Commit: 32a629ef2cff754c3dd6cc24eb1e25aeaf439891
Author: Stanislav Malyshev <stas@php.net> Mon, 8 Aug 2016 00:49:34 -0700
Committer: Ferenc Kovacs <tyra3l@gmail.com> Thu, 18 Aug 2016 12:52:15 +0200
Parents: 82b95bb758ac707a2372f2edaed70589b6f374d3
Branches: PHP-5.6.25
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=32a629ef2cff754c3dd6cc24eb1e25aeaf439891
Log:
Fixed bug #72627: Memory Leakage In exif_process_IFD_in_TIFF
Bugs:
https://bugs.php.net/72627
Changed paths:
M ext/exif/exif.c
A ext/exif/tests/bug72627..phpt
A ext/exif/tests/bug72627.tiff
Diff:
diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index f95de3a..657a2cc 100644
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -3768,8 +3768,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);
}
#ifdef EXIF_DEBUG
exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, "Read next IFD (THUMBNAIL)
done");
diff --git a/ext/exif/tests/bug72627.phpt b/ext/exif/tests/bug72627.phpt
new file mode 100644
index 0000000..bb6a1fa
--- /dev/null
+++ b/ext/exif/tests/bug72627.phpt
@@ -0,0 +1,71 @@
+--TEST--
+Bug #72627 (Memory Leakage In exif_process_IFD_in_TIFF)
+--SKIPIF--
+<?php if (!extension_loaded('exif')) print 'skip exif extension not
available';?>
+--FILE--
+<?php
+ $exif = exif_read_data(__DIR__ . '/bug72627.tiff',0,0,true);
+ var_dump($exif);
+?>
+--EXPECTF--
+Warning: exif_read_data(%s): Thumbnail goes IFD boundary or end of file reached in %sbug72627.php
on line %d
+
+Warning: exif_read_data(%s): Error in TIFF: filesize(x04E2) less than start of IFD dir(x829A0004)
in %sbug72627.php on line %d
+
+Warning: exif_read_data(%s): Thumbnail goes IFD boundary or end of file reached in %sbug72627.php
on line %d
+array(11) {
+ ["FileName"]=>
+ string(13) "bug72627.tiff"
+ ["FileDateTime"]=>
+ int(%d)
+ ["FileSize"]=>
+ int(1250)
+ ["FileType"]=>
+ int(7)
+ ["MimeType"]=>
+ string(10) "image/tiff"
+ ["SectionsFound"]=>
+ string(30) "ANY_TAG, IFD0, THUMBNAIL, EXIF"
+ ["COMPUTED"]=>
+ array(10) {
+ ["html"]=>
+ string(24) "width="128" height="132""
+ ["Height"]=>
+ int(132)
+ ["Width"]=>
+ int(128)
+ ["IsColor"]=>
+ int(0)
+ ["ByteOrderMotorola"]=>
+ int(0)
+ ["ApertureFNumber"]=>
+ string(5) "f/1.0"
+ ["Thumbnail.FileType"]=>
+ int(2)
+ ["Thumbnail.MimeType"]=>
+ string(10) "image/jpeg"
+ ["Thumbnail.Height"]=>
+ int(132)
+ ["Thumbnail.Width"]=>
+ int(128)
+ }
+ ["XResolution"]=>
+ string(21) "1414812756/1414812756"
+ ["THUMBNAIL"]=>
+ array(5) {
+ ["ImageWidth"]=>
+ int(128)
+ ["ImageLength"]=>
+ int(132)
+ ["JPEGInterchangeFormat"]=>
+ int(1280)
+ ["JPEGInterchangeFormatLength"]=>
+ int(100)
+ ["THUMBNAIL"]=>
+ NULL
+ }
+ ["ExposureTime"]=>
+ string(21) "1414812756/1414812756"
+ ["FNumber"]=>
+ string(21) "1414812756/1414812756"
+}
diff --git a/ext/exif/tests/bug72627.tiff b/ext/exif/tests/bug72627.tiff
new file mode 100644
index 0000000..229190a
Binary files /dev/null and b/ext/exif/tests/bug72627.tiff differ