cvs: php-src(PHP_5_0) / NEWS /ext/standard image.c

iliaa Mon Oct 4 16:43:21 2004 EDT Modified files: (Branch: PHP_5_0) /php-src NEWS /php-src/ext/standard image.c Log: MFH: Fixed bug #30281 (Prevent non-wbmp images from being detected as such) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.89&r2=1.1760.2.90&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.89 php-src/NEWS:1.1760.2.90 --- php-src/NEWS:1.1760.2.89 Mon Oct 4 05:04:00 2004 +++ php-src/NEWS Mon Oct 4 16:43:21 2004 @@ -1,8 +1,10 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2004, PHP 5.0.3 -- Fixed bug #30282 (segfault when using unknown/unsupported session.save_handler - and/or session.serialize_handler). (Tony) +- Fixed bug #30282 (segfault when using unknown/unsupported + session.save_handler and/or session.serialize_handler). (Tony) +- Fixed bug #30281 (Prevent non-wbmp images from being detected as such). + (Ilia) - Fixed bug #30276 (Possible crash in ctype_digit on large numbers). (Ilia) - Fixed bug #30224 (Sybase date strings are sometimes not null terminated). (Ilia) http://cvs.php.net/diff.php/php-src/ext/standard/image.c?r1=1.98.2.2&r2=1.98.2.3&ty=u Index: php-src/ext/standard/image.c diff -u php-src/ext/standard/image.c:1.98.2.2 php-src/ext/standard/image.c:1.98.2.3 --- php-src/ext/standard/image.c:1.98.2.2 Wed Aug 11 08:31:37 2004 +++ php-src/ext/standard/image.c Mon Oct 4 16:43:21 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: image.c,v 1.98.2.2 2004/08/11 12:31:37 derick Exp $ */ +/* $Id: image.c,v 1.98.2.3 2004/10/04 20:43:21 iliaa Exp $ */ #include "php.h" #include <stdio.h> @@ -957,7 +957,7 @@ } while (i & 0x80); /* maximum valid sizes for wbmp (although 127x127 may be a more accurate one) */ - if (height > 2048 || width > 2048) { + if (!height || !width || height > 2048 || width > 2048) { return 0; }