svn: /php/php-src/branches/PHP_5_2/ext/gd/ gd.c

mj Sat, 11 Dec 2010 20:10:15 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=306235

Log:
Merge from trunk:

* Fixed parameter check introduced with the recent fix for bug #53492.

* Improved the error message along the way.

Bug: http://bugs.php.net/53492 (Closed) Stack buffer overflow in imagepstext

Changed paths:
U php/php-src/branches/PHP_5_2/ext/gd/gd.c

Modified: php/php-src/branches/PHP_5_2/ext/gd/gd.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/gd/gd.c 2010-12-11 20:09:39 UTC (rev 306234)
+++ php/php-src/branches/PHP_5_2/ext/gd/gd.c 2010-12-11 20:10:15 UTC (rev 306235)
@@ -4593,8 +4593,8 @@
return;
}

- if (aa_steps != 4 || aa_steps != 16) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "AA steps must be 4 or 16");
+ if (aa_steps != 4 && aa_steps != 16) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Antialias steps must be 4 or 16");
RETURN_FALSE;
}