diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-12-16 11:37:29 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-12-16 11:37:29 -0800 |
| commit | de4a2c3cbd17777930059db000fd79eb3ec0bee8 (patch) | |
| tree | 61ca42b5572265b81cfc113c57c1370b1381e671 | |
| parent | 85a10166e138aa45a2d8f1786a3a7ca211c14982 (diff) | |
| parent | 57408f9c85bbb40004520d2e193998fdf190c17d (diff) | |
| download | php-git-de4a2c3cbd17777930059db000fd79eb3ec0bee8.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug #65873 - Integer overflow in exif_read_data()
| -rw-r--r-- | ext/exif/exif.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ext/exif/exif.c b/ext/exif/exif.c index f886bb4fea..eb00f04327 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -2842,7 +2842,12 @@ static int exif_process_IFD_TAG(image_info_type *ImageInfo, char *dir_entry, cha offset_val = php_ifd_get32u(dir_entry+8, ImageInfo->motorola_intel); /* If its bigger than 4 bytes, the dir entry contains an offset. */ value_ptr = offset_base+offset_val; - if (byte_count > IFDlength || offset_val > IFDlength-byte_count || value_ptr < dir_entry) { + /* + dir_entry is ImageInfo->file.list[sn].data+2+i*12 + 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)) { /* 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. */ |