]> granicus.if.org Git - php/commitdiff
Bug #30627
authorMarcus Boerger <helly@php.net>
Thu, 4 Nov 2004 20:13:30 +0000 (20:13 +0000)
committerMarcus Boerger <helly@php.net>
Thu, 4 Nov 2004 20:13:30 +0000 (20:13 +0000)
ext/exif/exif.c

index 80e5ec2fda7c99c8bd8b70b84a516b0aa0081330..aced27d6c7d4daa40773600c5eb76b505811e9c8 100644 (file)
@@ -2734,7 +2734,7 @@ static int exif_process_IFD_TAG(image_info_type *ImageInfo, char *dir_entry, cha
                        // JPEG does not use absolute pointers instead its pointers are relative to the start
                        // of the TIFF header in APP1 section.
                        */
-                       if (offset_val+byte_count>ImageInfo->FileSize || (ImageInfo->FileType!=IMAGE_FILETYPE_TIFF_II && ImageInfo->FileType!=IMAGE_FILETYPE_TIFF_MM)) {
+                       if (offset_val+byte_count>ImageInfo->FileSize || (ImageInfo->FileType!=IMAGE_FILETYPE_TIFF_II && ImageInfo->FileType!=IMAGE_FILETYPE_TIFF_MM && ImageInfo->FileType!=IMAGE_FILETYPE_JPEG)) {
                                if (value_ptr < dir_entry) {
                                        /* we can read this if offset_val > 0 */
                                        /* some files have their values in other parts of the file */