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

[Stanislav Malyshev]

stas            Thu Mar  8 00:47:04 2007 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/standard       string.c 
  Log:
  clarify checks and error messages
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.48&r2=1.445.2.14.2.49&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.48 
php-src/ext/standard/string.c:1.445.2.14.2.49
--- php-src/ext/standard/string.c:1.445.2.14.2.48       Thu Mar  8 00:18:10 2007
+++ php-src/ext/standard/string.c       Thu Mar  8 00:47:04 2007
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: string.c,v 1.445.2.14.2.48 2007/03/08 00:18:10 iliaa Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.49 2007/03/08 00:47:04 stas Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -4655,7 +4655,7 @@
                                php_error_docref(NULL TSRMLS_CC, E_WARNING, 
"Length should be greater than 0.");
                                RETURN_FALSE;           
                        }
-                       if ((p + Z_LVAL_PP(length)) <= p || (p + 
Z_LVAL_PP(length)) > endp) {
+                       if (Z_LVAL_PP(length) > (Z_STRLEN_PP(haystack) - 
Z_LVAL_PP(offset))) {
                                php_error_docref(NULL TSRMLS_CC, E_WARNING, 
"Length value %ld exceeds string length.", Z_LVAL_PP(length));
                                RETURN_FALSE;
                        }
@@ -5076,11 +5076,16 @@
                offset = (offset < 0) ? 0 : offset;
        }
 
-       if ((offset + len) > s1_len || (offset+len) < 0) {
+       if(offset > s1_len) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "The start position 
cannot exceed initial string length");
                RETURN_FALSE;
        }
 
+       if(len > s1_len - offset) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "The length cannot 
exceed initial string length");
+               RETURN_FALSE;
+       }
+
        cmp_len = (uint) (len ? len : MAX(s2_len, (s1_len - offset)));
 
        if (!cs) {

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