cvs: php-src(PHP_5_1) /ext/standard string.c /ext/standard/tests/strings bug33605.phpt substr_compare.phpt

From: Date: Tue, 25 Apr 2006 12:48:42 +0000
Subject: cvs: php-src(PHP_5_1) /ext/standard string.c /ext/standard/tests/strings bug33605.phpt substr_compare.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-37916@lists.php.net to get a copy of this message
tony2001 Tue Apr 25 12:48:42 2006 UTC Added files: (Branch: PHP_5_1) /php-src/ext/standard/tests/strings substr_compare.phpt bug33605.phpt Modified files: /php-src/ext/standard string.c Log: fix possible substr_compare() crash add new tests http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/string.c?r1=1.445.2.13&r2=1.445.2.14&diff_format=u Index: php-src/ext/standard/string.c diff -u php-src/ext/standard/string.c:1.445.2.13 php-src/ext/standard/string.c:1.445.2.14 --- php-src/ext/standard/string.c:1.445.2.13 Mon Apr 3 09:14:33 2006 +++ php-src/ext/standard/string.c Tue Apr 25 12:48:41 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string.c,v 1.445.2.13 2006/04/03 09:14:33 tony2001 Exp $ */ +/* $Id: string.c,v 1.445.2.14 2006/04/25 12:48:41 tony2001 Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -4884,13 +4884,19 @@ RETURN_FALSE; } - if ((offset + len) >= s1_len) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "The start position cannot exceed initial string length."); + if (ZEND_NUM_ARGS() >= 4 && len <= 0) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "The length must be greater than zero"); RETURN_FALSE; } if (offset < 0) { offset = s1_len + offset; + offset = (offset < 0) ? 0 : offset; + } + + if ((offset + len) >= s1_len) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "The start position cannot exceed initial string length"); + RETURN_FALSE; } cmp_len = (uint) (len ? len : MAX(s2_len, (s1_len - offset))); http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/tests/strings/substr_compare.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/substr_compare.phpt +++ php-src/ext/standard/tests/strings/substr_compare.phpt http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/tests/strings/bug33605.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/bug33605.phpt +++ php-src/ext/standard/tests/strings/bug33605.phpt

« previous php.cvs (#37916) next »