com php-src: Fix bug #77753 - Heap-buffer-overflow in php_ifd_get32s: ext/exif/exif.c ext/exif/tests/ bug77753.phpt ext/exif/tests/bug77753 .tiff
| From: | Sara Golemon | Date: | Tue, 02 Apr 2019 14:59:43 +0000 |
| Subject: | com php-src: Fix bug #77753 - Heap-buffer-overflow in php_ifd_get32s: 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-105486@lists.php.net to get a copy of this message | ||
Commit: 1c0d06441aefee18b30520e2b1ae89cbfcf56a59
Author: Stanislav Malyshev <stas@php.net> Sun, 17 Mar 2019 22:54:46 -0700
Committer: Sara Golemon <pollita@php.net> Tue, 2 Apr 2019 10:59:43 -0400
Parents: d9c98d5c878822bab207483f0e10eda2bcf69bd3
Branches: PHP-7.2.17
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1c0d06441aefee18b30520e2b1ae89cbfcf56a59
Log:
Fix bug #77753 - Heap-buffer-overflow in php_ifd_get32s
Bugs:
https://bugs.php.net/77753
Changed paths:
M ext/exif/exif.c
A ext/exif/tests/bug77753.phpt
A ext/exif/tests/bug77753.tiff
Diff:
diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index f5bc98a..407145f 100644
--- a/ext/exif/exif..c
+++ b/ext/exif/exif.c
@@ -3215,6 +3215,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