cvs: php-src(PHP_5_0) / NEWS /ext/exif exif.c /ext/exif/tests bug34704.jpg bug34704.phpt

helly Sun Oct 9 10:38:08 2005 EDT Added files: (Branch: PHP_5_0) /php-src/ext/exif/tests bug34704.jpg bug34704.phpt Modified files: /php-src NEWS /php-src/ext/exif exif.c Log: - MFH Bugfix #34704 (Infinite recursion due to corrupt JPEG) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.493&r2=1.1760.2.494&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.493 php-src/NEWS:1.1760.2.494 --- php-src/NEWS:1.1760.2.493 Sun Oct 9 08:41:25 2005 +++ php-src/NEWS Sun Oct 9 10:38:06 2005 @@ -6,6 +6,7 @@ values). (Dmitry) - Fixed bug #34787 (SOAP Client not handling boolean types correctly). (Dmitry) - Fixed bug #34723 (array_count_values() strips leading zeroes). (Tony) +- Fixed bug #34704 (Infinite recursion due to corrupt JPEG). (Marcus) - Fixed bug #34678 (__call(), is_callable() and static methods). (Dmitry) - Fixed bug #34643 (wsdl default value has no effect). (Dmitry) - Fixed bug #34617 (zend_deactivate: objects_store used after @@ -17,6 +18,8 @@ - Fixed bug #34453 (parsing http://www.w3.org/2001/xml.xsd exception). (Dmitry) - Fixed bug #34450 (Segfault when calling mysqli_close() in destructor). (Tony) - Fixed bug #34449 (ext/soap: XSD_ANYXML functionality not exposed). (Dmitry) +- Fixed Bug #34243 (ReflectionClass::getDocComment() returns no result). + (Marcus) - Fixed bug #34199 (if($obj)/if(!$obj) inconsistency because of cast handler). (Dmitry, Alex) - Fixed bug #32179 (xmlrpc_encode() segfaults with recursive references). (Tony) http://cvs.php.net/diff.php/php-src/ext/exif/exif.c?r1=1.162.2.9&r2=1.162.2.10&ty=u Index: php-src/ext/exif/exif.c diff -u php-src/ext/exif/exif.c:1.162.2.9 php-src/ext/exif/exif.c:1.162.2.10 --- php-src/ext/exif/exif.c:1.162.2.9 Fri Aug 5 10:00:47 2005 +++ php-src/ext/exif/exif.c Sun Oct 9 10:38:07 2005 @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2004 The PHP Group | + | Copyright (c) 1997-2005 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.0 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: exif.c,v 1.162.2.9 2005/08/05 14:00:47 hyanantha Exp $ */ +/* $Id: exif.c,v 1.162.2.10 2005/10/09 14:38:07 helly Exp $ */ /* ToDos * @@ -115,7 +115,7 @@ }; /* }}} */ -#define EXIF_VERSION "1.4 $Id: exif.c,v 1.162.2.9 2005/08/05 14:00:47 hyanantha Exp $" +#define EXIF_VERSION "1.4 $Id: exif.c,v 1.162.2.10 2005/10/09 14:38:07 helly Exp $" /* {{{ PHP_MINFO_FUNCTION */ @@ -3032,6 +3032,12 @@ } } /* + * Ignore IFD2 if it purportedly exists + */ + if (section_index == SECTION_THUMBNAIL) { + return FALSE; + } + /* * Hack to make it process IDF1 I hope * There are 2 IDFs, the second one holds the keys (0x0201 and 0x0202) to the thumbnail */ http://cvs.php.net/co.php/php-src/ext/exif/tests/bug34704.phpt?r=1.1&p=1 Index: php-src/ext/exif/tests/bug34704.phpt +++ php-src/ext/exif/tests/bug34704.phpt --TEST-- Bug # 34704 (Infinite recursion due to corrupt JPEG) --SKIPIF-- <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?> --INI-- magic_quotes_runtime=0 output_handler= zlib.output_compression=0 --FILE-- <?php $infile = dirname(__FILE__).'/bug34704.jpg'; var_dump(exif_read_data($infile)); ?> ===DONE=== --EXPECT-- array(7) { ["FileName"]=> string(12) "bug34704.jpg" ["FileDateTime"]=> int(1128866682) ["FileSize"]=> int(9976) ["FileType"]=> int(2) ["MimeType"]=> string(10) "image/jpeg" ["SectionsFound"]=> string(4) "IFD0" ["COMPUTED"]=> array(5) { ["html"]=> string(24) "width="386" height="488"" ["Height"]=> int(488) ["Width"]=> int(386) ["IsColor"]=> int(1) ["ByteOrderMotorola"]=> int(0) } } ===DONE===