helly Thu Nov 4 15:15:39 2004 EDT Modified files: (Branch: PHP_5_0) /php-src/ext/exif exif.c /php-src NEWS Log: MFH Bug #30627 http://cvs.php.net/diff.php/php-src/ext/exif/exif.c?r1=1.162&r2=1.162.2.1&ty=u Index: php-src/ext/exif/exif.c diff -u php-src/ext/exif/exif.c:1.162 php-src/ext/exif/exif.c:1.162.2.1 --- php-src/ext/exif/exif.c:1.162 Tue Mar 16 15:58:01 2004 +++ php-src/ext/exif/exif.c Thu Nov 4 15:15:38 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: exif.c,v 1.162 2004/03/16 20:58:01 derick Exp $ */ +/* $Id: exif.c,v 1.162.2.1 2004/11/04 20:15:38 helly Exp $ */ /* ToDos * @@ -111,7 +111,7 @@ }; /* }}} */ -#define EXIF_VERSION "1.4 $Id: exif.c,v 1.162 2004/03/16 20:58:01 derick Exp $" +#define EXIF_VERSION "1.4 $Id: exif.c,v 1.162.2.1 2004/11/04 20:15:38 helly Exp $" /* {{{ PHP_MINFO_FUNCTION */ @@ -2734,7 +2734,7 @@ // 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 */ http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.115&r2=1.1760.2.116&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.115 php-src/NEWS:1.1760.2.116 --- php-src/NEWS:1.1760.2.115 Thu Nov 4 10:29:53 2004 +++ php-src/NEWS Thu Nov 4 15:15:38 2004 @@ -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)
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php