diff options
| author | Stanislav Malyshev <stas@php.net> | 2020-03-15 17:26:00 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2020-03-15 17:26:00 -0700 |
| commit | 41f66e2a2cfd611e35be5ac3bf747f0b56161216 (patch) | |
| tree | 828222f6ef5493585363795a4a0ff874e2ec6f31 | |
| parent | 63f6608f89fda8ad35bc8c5472d1028e6fa6e0c6 (diff) | |
| download | php-git-41f66e2a2cfd611e35be5ac3bf747f0b56161216.tar.gz | |
Fixed bug #79282
| -rw-r--r-- | ext/exif/exif.c | 7 | ||||
| -rw-r--r-- | ext/exif/tests/bug79282.phpt | 15 |
2 files changed, 21 insertions, 1 deletions
diff --git a/ext/exif/exif.c b/ext/exif/exif.c index 7fe055f381..819708c2d3 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -3692,6 +3692,11 @@ static void exif_process_TIFF_in_JPEG(image_info_type *ImageInfo, char *CharBuf, { unsigned exif_value_2a, offset_of_ifd; + if (length < 2) { + exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_WARNING, "Missing TIFF alignment marker"); + return; + } + /* set the thumbnail stuff to nothing so we can test to see if they get set up */ if (memcmp(CharBuf, "II", 2) == 0) { ImageInfo->motorola_intel = 0; @@ -3844,7 +3849,7 @@ static int exif_scan_JPEG_header(image_info_type *ImageInfo) return FALSE; } - sn = exif_file_sections_add(ImageInfo, marker, itemlen+1, NULL); + sn = exif_file_sections_add(ImageInfo, marker, itemlen, NULL); Data = ImageInfo->file.list[sn].data; /* Store first two pre-read bytes. */ diff --git a/ext/exif/tests/bug79282.phpt b/ext/exif/tests/bug79282.phpt new file mode 100644 index 0000000000..7b7e365657 --- /dev/null +++ b/ext/exif/tests/bug79282.phpt @@ -0,0 +1,15 @@ +--TEST-- +Bug #79282: Use-of-uninitialized-value in exif +--FILE-- +<?php + +var_dump(exif_read_data('data://image/jpeg;base64,/9jhAAlFeGlmAAAg')); + +?> +--EXPECTF-- +Warning: exif_read_data(): Invalid TIFF alignment marker in %s on line %d + +Warning: exif_read_data(): File structure corrupted in %s on line %d + +Warning: exif_read_data(): Invalid JPEG file in %s on line %d +bool(false) |