com php-src: Merge branch 'PHP-7.2' into PHP-7.3: NEWS ext/exif/exif.c ext/exif/tests/bug77753.phpt ext/exif/tests/bug77753.tiff
| From: | Christoph Michael Becker | Date: | Tue, 02 Apr 2019 08:00:54 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.2' into PHP-7.3: NEWS ext/exif/exif.c ext/exif/tests/bug77753.phpt ext/exif/tests/bug77753.tiff | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-105463@lists.php.net to get a copy of this message | ||
Commit: 426ca8e961187d427f2dd8c82f3f36698e77ad4c
Author: Stanislav Malyshev <stas@php.net> Sun, 31 Mar 2019 23:09:57 -0700
Committer: Christoph M. Becker <cmbecker69@gmx.de> Tue, 2 Apr 2019 10:00:54 +0200
Parents: 5b7a781a5d49854d9e3abf7944b478d0d98d6c5e
Branches: PHP-7..3.4
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=426ca8e961187d427f2dd8c82f3f36698e77ad4c
Log:
Merge branch 'PHP-7..2' into PHP-7.3
* PHP-7.2:
Fix bug #77753 - Heap-buffer-overflow in php_ifd_get32s
(cherry picked from commit 9efaac30aeff82a61a015f4de53eb1ece2d93d61)
Bugs:
https://bugs.php.net/77753
Changed paths:
M NEWS
M ext/exif/exif.c
A ext/exif/tests/bug77753.phpt
A ext/exif/tests/bug77753.tiff
Diff:
diff --git a/NEWS b/NEWS
index 98bcebf..17b420f 100644
--- a/NEWS
+++ b/NEWS
@@ -26,6 +26,9 @@ PHP NEWS
- COM:
. Fixed bug #77578 (Crash when php unload). (cmb)
+- EXIF:
+ . Fixed bug #77753 (Heap-buffer-overflow in php_ifd_get32s). (Stas)
+
- FPM:
. Fixed bug #77677 (FPM fails to build on AIX due to missing WCOREDUMP).
(Kevin Adler)
diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index 1b7d0cc..5b12922 100644
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -3188,6 +3188,10 @@ static int exif_process_IFD_in_MAKERNOTE(image_info_type *ImageInfo, char *
valu
exif_error_docref("exif_read_data#error_ifd" EXIFERR_CC, ImageInfo, E_WARNING,
"Illegal IFD size: 2 + 0x%04X*12 = 0x%04X > 0x%04X", NumDirEntries, 2+NumDirEntries*12,
value_len);
return FALSE;
}
+ if ((dir_start - value_ptr) > value_len - (2+NumDirEntries*12)) {
+ exif_error_docref("exif_read_data#error_ifd" EXIFERR_CC, ImageInfo, E_WARNING,
"Illegal IFD size: 0x%04X > 0x%04X", (dir_start - value_ptr) + (2+NumDirEntries*12),
value_len);
+ return FALSE;
+ }
for (de=0;de<NumDirEntries;de++) {
if (!exif_process_IFD_TAG(ImageInfo, dir_start + 2 + 12 * de,
diff --git a/ext/exif/tests/bug77753.phpt b/ext/exif/tests/bug77753.phpt
new file mode 100644
index 0000000..d987a5c
--- /dev/null
+++ b/ext/exif/tests/bug77753.phpt
@@ -0,0 +1,16 @@
+--TEST--
+Bug #77753 (Heap-buffer-overflow in php_ifd_get32s)
+--SKIPIF--
+<?php if (!extension_loaded('exif')) print 'skip exif extension not
available';?>
+--FILE--
+<?php
+var_dump(exif_read_data(__DIR__."/bug77753.tiff"));
+?>
+DONE
+--EXPECTF--
+%A
+Warning: exif_read_data(bug77753.tiff): Illegal IFD size: 0x006A > 0x0065 in %sbug77753.php on
line %d
+
+Warning: exif_read_data(bug77753.tiff): Invalid TIFF file in %sbug77753.php on line %d
+bool(false)
+DONE
\ No newline at end of file
diff --git a/ext/exif/tests/bug77753.tiff b/ext/exif/tests/bug77753.tiff
new file mode 100644
index 0000000..b237f39
Binary files /dev/null and b/ext/exif/tests/bug77753.tiff differ