diff options
| author | Marcus Boerger <helly@php.net> | 2004-11-04 20:15:38 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2004-11-04 20:15:38 +0000 |
| commit | 5fd210de89d356c96abe1632a234e08ff1828a06 (patch) | |
| tree | f8500cc4c9250871f62f683d9b79e5aab72fec8a | |
| parent | 49c5edcb9f870f6e640a5d0cf75d274af02403b9 (diff) | |
| download | php-git-5fd210de89d356c96abe1632a234e08ff1828a06.tar.gz | |
MFH Bug #30627
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | ext/exif/exif.c | 2 |
2 files changed, 5 insertions, 3 deletions
@@ -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 80e5ec2fda..aced27d6c7 100644 --- 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 */ |