diff options
| author | Kalle Sommer Nielsen <kalle@php.net> | 2013-12-18 07:27:14 +0100 |
|---|---|---|
| committer | Kalle Sommer Nielsen <kalle@php.net> | 2013-12-18 07:27:14 +0100 |
| commit | 2eb9bd316d818048074c1314f73b3c9b3d490c9b (patch) | |
| tree | d2a9e8d311a2a882ea7e2f286339501471ff0f4a /ext/exif/exif.c | |
| parent | d14670ccdb2782abaaaa721d1c379138fa64aae6 (diff) | |
| parent | c0f1e6946dd924359078a8e6be8a8ad8180c10ec (diff) | |
| download | php-git-2eb9bd316d818048074c1314f73b3c9b3d490c9b.tar.gz | |
Merge branch 'master' of https://git.php.net/push/php-src
Diffstat (limited to 'ext/exif/exif.c')
| -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. */ |