diff options
| author | Stanislav Malyshev <stas@php.net> | 2019-04-29 23:38:12 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2019-04-30 00:05:23 -0700 |
| commit | f80ad18afae2230c2c1802c7d829100af646874e (patch) | |
| tree | e96da8354d3cb7700061b859a87580e3581795f9 | |
| parent | 6c631ccfef94f93259d474682f8bfa803e163c87 (diff) | |
| download | php-git-f80ad18afae2230c2c1802c7d829100af646874e.tar.gz | |
Fix bug #77950 - Heap-buffer-overflow in _estrndup via exif_process_IFD_TAG
I do not completely understand what is going on there, but I am pretty
sure dir_entry <= offset_base if not a normal situation, so we better not
to rely on such dir_entry.
| -rw-r--r-- | NEWS | 11 | ||||
| -rw-r--r-- | ext/exif/exif.c | 2 | ||||
| -rw-r--r-- | ext/exif/tests/bug77950.phpt | 12 | ||||
| -rw-r--r-- | ext/exif/tests/bug77950.tiff | bin | 0 -> 1267 bytes |
4 files changed, 22 insertions, 3 deletions
@@ -2,13 +2,20 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2019, PHP 7.1.29 +- EXIF +. Fixed bug #77950 (Heap-buffer-overflow in _estrndup via exif_process_IFD_TAG). + (CVE-2019-11036) (Stas) +- Mail +. Fixed bug #77821 (Potential heap corruption in TSendMail()). (cmb) 04 Apr 2019, PHP 7.1.28 - EXIF: - . Fixed bug #77753 (Heap-buffer-overflow in php_ifd_get32s). (Stas) - . Fixed bug #77831 (Heap-buffer-overflow in exif_iif_add_value). (Stas) + . Fixed bug #77753 (Heap-buffer-overflow in php_ifd_get32s). (CVE-2019-11034) + (Stas) + . Fixed bug #77831 (Heap-buffer-overflow in exif_iif_add_value). + (CVE-2019-11035) (Stas) - SQLite3: . Added sqlite3.defensive INI directive. (BohwaZ) diff --git a/ext/exif/exif.c b/ext/exif/exif.c index a763f6c77b..d174def80c 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -2891,7 +2891,7 @@ static int exif_process_IFD_TAG(image_info_type *ImageInfo, char *dir_entry, cha offset_base is ImageInfo->file.list[sn].data-dir_offset dir_entry - offset_base is dir_offset+2+i*12 */ - if (byte_count > IFDlength || offset_val > IFDlength-byte_count || value_ptr < dir_entry || offset_val < (size_t)(dir_entry-offset_base)) { + if (byte_count > IFDlength || offset_val > IFDlength-byte_count || value_ptr < dir_entry || offset_val < (size_t)(dir_entry-offset_base) || dir_entry <= offset_base) { /* It is important to check for IMAGE_FILETYPE_TIFF * JPEG does not use absolute pointers instead its pointers are * relative to the start of the TIFF header in APP1 section. */ diff --git a/ext/exif/tests/bug77950.phpt b/ext/exif/tests/bug77950.phpt new file mode 100644 index 0000000000..dc0f3549cb --- /dev/null +++ b/ext/exif/tests/bug77950.phpt @@ -0,0 +1,12 @@ +--TEST-- +Bug #77950 (Heap-buffer-overflow in _estrndup via exif_process_IFD_TAG) +--SKIPIF-- +<?php if (!extension_loaded('exif')) print 'skip exif extension not available';?> +--FILE-- +<?php +exif_read_data(__DIR__."/bug77950.tiff"); +?> +DONE +--EXPECTF-- +%A +DONE
\ No newline at end of file diff --git a/ext/exif/tests/bug77950.tiff b/ext/exif/tests/bug77950.tiff Binary files differnew file mode 100644 index 0000000000..5c8250ab04 --- /dev/null +++ b/ext/exif/tests/bug77950.tiff |