iliaa Wed Jun 1 18:28:38 2005 EDT
Modified files: (Branch: PHP_5_0)
/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.1760.2.410&r2=1.1760.2.411&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.410 php-src/NEWS:1.1760.2.411
--- php-src/NEWS:1.1760.2.410 Wed Jun 1 10:42:48 2005
+++ php-src/NEWS Wed Jun 1 18:28:37 2005
@@ -12,6 +12,7 @@
- Fixed ext/mysqli to allocate less memory when fetching bound params
of type (MEDIUM|LONG)BLOB/(MEDIUM|LONG)TEXT. (Andrey)
- Fixed memory corruption in ImageTTFText() with 64bit systems. (Andrey)
+- 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 #33185 (--enable-session=shared does not build). (Jani)
http://cvs.php.net/diff.php/php-src/ext/standard/image.c?r1=1.98.2.8&r2=1.98.2.9&ty=u
Index: php-src/ext/standard/image.c
diff -u php-src/ext/standard/image.c:1.98.2.8
php-src/ext/standard/image.c:1.98.2.9
--- php-src/ext/standard/image.c:1.98.2.8 Sun Mar 6 12:04:22 2005
+++ php-src/ext/standard/image.c Wed Jun 1 18:28:38 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: image.c,v 1.98.2.8 2005/03/06 17:04:22 iliaa Exp $ */
+/* $Id: image.c,v 1.98.2.9 2005/06/01 22:28:38 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
