MFH Bug #30627

diff --git a/NEWS b/NEWS
index 4ba0d5fc08c34a92449c5ebf60b26be5bdf82054..739fc1ed2f45d1c45c7d75595a50eafb01a00ad1 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,15 +1,17 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2004, PHP 5.0.3
-- Fixed bug #30685 (Malformed SOAPClient http header reequest). (Dmitry)
-- Fixed bug #30645 (def. multi result set support for mysql_connect). (Georg)
 - Fixed error handling in mysqli_multi_query. (Georg)
 - Fixed a problem with SPL iterators aggregating the innner iterator. (Marcus)
 - Extended the functionality of is_subclass_of() to accept either a class name
   or an object as first parameter. (Andrey) 
 - Fixed potential problems with unserializing invalid serialize data. (Marcus)
+- Fixed bug #30685 (Malformed SOAPClient http header reequest). (Dmitry)
+- Fixed bug #30672 (Problem handling exif data in jpeg images at unusual 
+  places). (Marcus)
 - Fixed bug #30658 (Ensure that temporary files created by GD are removed).
   (Ilia)
+- Fixed bug #30645 (def. multi result set support for mysql_connect). (Georg)
 - Fixed bug #30572 (crash when comparing SimpleXML attribute to a boolean).
   (Andi)
 - Fixed bug #30475 (curl_getinfo() may crash in some situations). (Ilia)

diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index 80e5ec2fda7c99c8bd8b70b84a516b0aa0081330..aced27d6c7d4daa40773600c5eb76b505811e9c8 100644 (file)
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -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 */