diff options
| author | Stanislav Malyshev <stas@php.net> | 2019-03-17 22:54:46 -0700 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2019-04-02 10:59:43 -0400 |
| commit | 1c0d06441aefee18b30520e2b1ae89cbfcf56a59 (patch) | |
| tree | 611afeaef6cf8a05b928675d01108246652f0334 | |
| parent | d9c98d5c878822bab207483f0e10eda2bcf69bd3 (diff) | |
| download | php-git-1c0d06441aefee18b30520e2b1ae89cbfcf56a59.tar.gz | |
Fix bug #77753 - Heap-buffer-overflow in php_ifd_get32s
| -rw-r--r-- | ext/exif/exif.c | 4 | ||||
| -rw-r--r-- | ext/exif/tests/bug77753.phpt | 16 | ||||
| -rw-r--r-- | ext/exif/tests/bug77753.tiff | bin | 0 -> 873 bytes |
3 files changed, 20 insertions, 0 deletions
diff --git a/ext/exif/exif.c b/ext/exif/exif.c index f5bc98a226..407145fffc 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 0000000000..d987a5cf46 --- /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 Binary files differnew file mode 100644 index 0000000000..b237f39e2b --- /dev/null +++ b/ext/exif/tests/bug77753.tiff |