[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard string.c

[Ilia Alshanetsky]

iliaa           Fri Jan 30 00:16:28 2009 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/standard       string.c 
  Log:
  
  Improved validation checks inside str_pad()
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.69.2.40&r2=1.445.2.14.2.69.2.41&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.69.2.40 
php-src/ext/standard/string.c:1.445.2.14.2.69.2.41
--- php-src/ext/standard/string.c:1.445.2.14.2.69.2.40  Wed Dec 31 11:15:46 2008
+++ php-src/ext/standard/string.c       Fri Jan 30 00:16:27 2009
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: string.c,v 1.445.2.14.2.69.2.40 2008/12/31 11:15:46 sebastian Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.69.2.41 2009/01/30 00:16:27 iliaa Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -4816,7 +4816,7 @@
 
        /* If resulting string turns out to be shorter than input string,
           we simply copy the input and return. */
-       if (pad_length < 0 || num_pad_chars < 0) {
+       if (pad_length <= 0 || num_pad_chars <= 0) {
                RETURN_STRINGL(input, input_len, 1);
        }
 



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