diff options
| author | Stanislav Malyshev <stas@php.net> | 2019-04-30 00:05:43 -0700 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-04-30 09:57:44 +0200 |
| commit | 6484774161f30571fc1b3a67b3c06f2d43f16ca8 (patch) | |
| tree | fb841ff27ebfda628dccb3661e66a496b76bcc09 | |
| parent | e0b907d0a4cd5b42aefb03c2a6917bd8a29f8abc (diff) | |
| download | php-git-6484774161f30571fc1b3a67b3c06f2d43f16ca8.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix bug #77950 - Heap-buffer-overflow in _estrndup via exif_process_IFD_TAG
(cherry picked from commit 66b32f25d56147bbd8fc4733959389d30f6621af)
| -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 |
3 files changed, 13 insertions, 1 deletions
diff --git a/ext/exif/exif.c b/ext/exif/exif.c index f6419b7038..78269b9a92 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -3277,7 +3277,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 |