cvs: php-src(PHP_4_3) / NEWS /ext/exif exif.c

helly Thu Nov 4 15:17:27 2004 EDT Modified files: (Branch: PHP_4_3) /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.118.2.27&r2=1.118.2.28&ty=u Index: php-src/ext/exif/exif.c diff -u php-src/ext/exif/exif.c:1.118.2.27 php-src/ext/exif/exif.c:1.118.2.28 --- php-src/ext/exif/exif.c:1.118.2.27 Wed Dec 17 04:08:37 2003 +++ php-src/ext/exif/exif.c Thu Nov 4 15:17:24 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: exif.c,v 1.118.2.27 2003/12/17 09:08:37 helly Exp $ */ +/* $Id: exif.c,v 1.118.2.28 2004/11/04 20:17:24 helly Exp $ */ /* ToDos * @@ -99,7 +99,7 @@ }; /* }}} */ -#define EXIF_VERSION "1.4 $Id: exif.c,v 1.118.2.27 2003/12/17 09:08:37 helly Exp $" +#define EXIF_VERSION "1.4 $Id: exif.c,v 1.118.2.28 2004/11/04 20:17:24 helly Exp $" /* {{{ PHP_MINFO_FUNCTION */ @@ -2712,7 +2712,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.1247.2.750&r2=1.1247.2.751&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.750 php-src/NEWS:1.1247.2.751 --- php-src/NEWS:1.1247.2.750 Wed Nov 3 08:42:51 2004 +++ php-src/NEWS Thu Nov 4 15:17:25 2004 @@ -4,6 +4,8 @@ - Fixed a bug in addslashes() handling of the '\0' character. (Ilia) - Backported Marcus' foreach() speedup patch from PHP 5.x. (Derick) - Fixed potential problems with unserializing invalid serialize data. (Marcus) +- 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 #30654 (oci8 persistent connection is deleted from hash