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

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

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_3/ext/gd/gd.c

Modified: php/php-src/branches/PHP_5_3/ext/gd/gd.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/gd/gd.c    2010-12-11 20:10:15 UTC (rev 
306235)
+++ php/php-src/branches/PHP_5_3/ext/gd/gd.c    2010-12-11 20:10:39 UTC (rev 
306236)
@@ -4228,8 +4228,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;
        }


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to