iliaa Wed Jun 1 18:29:20 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/ext/standard image.c
Log:
MFH: Fixed bug #33210 (relax jpeg recursive loop protection).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.915&r2=1.1247.2.916&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.915 php-src/NEWS:1.1247.2.916
--- php-src/NEWS:1.1247.2.915 Tue May 31 08:56:00 2005
+++ php-src/NEWS Wed Jun 1 18:29:19 2005
@@ -7,6 +7,7 @@
them sort based on the current locale. (Derick)
- Changed sha1_file() and md5_file() functions to use streams instead of
low level IO. (Uwe)
+- Fixed bug #33210 (relax jpeg recursive loop protection). (Ilia)
- Fixed bug #33200 (preg_replace(): magic_quotes_sybase=On makes 'e' modifier
misbehave). (Jani)
- Fixed bug #33072 (Add a safemode/open_basedir check for runtime save_path
http://cvs.php.net/diff.php/php-src/ext/standard/image.c?r1=1.72.2.18&r2=1.72.2.19&ty=u
Index: php-src/ext/standard/image.c
diff -u php-src/ext/standard/image.c:1.72.2.18
php-src/ext/standard/image.c:1.72.2.19
--- php-src/ext/standard/image.c:1.72.2.18 Sun Mar 6 12:05:41 2005
+++ php-src/ext/standard/image.c Wed Jun 1 18:29:20 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: image.c,v 1.72.2.18 2005/03/06 17:05:41 iliaa Exp $ */
+/* $Id: image.c,v 1.72.2.19 2005/06/01 22:29:20 iliaa Exp $ */
#include "php.h"
#include <stdio.h>
@@ -401,7 +401,7 @@
last_marker = M_PSEUDO; /* stop skipping non
0xff for M_COM */
}
}
- if (++a > 10)
+ if (++a > 25)
{
/* who knows the maxim amount of 0xff? though 7 */
/* but found other implementations */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
