stasTue Aug 5 20:11:17 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/strings explode_bug.phpt
Modified files:
/ZendEngine2zend_operators.h
Log:
fix memnstr bug, by Laurent Gaffie
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_operators.h?r1=1.94.2.4.2.11&r2=1.94.2.4.2.12&diff_format=u
Index: ZendEngine2/zend_operators.h
diff -u ZendEngine2/zend_operators.h:1.94.2.4.2.11
ZendEngine2/zend_operators.h:1.94.2.4.2.12
--- ZendEngine2/zend_operators.h:1.94.2.4.2.11 Mon Dec 31 07:20:03 2007
+++ ZendEngine2/zend_operators.hTue Aug 5 20:11:17 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend_operators.h,v 1.94.2.4.2.11 2007/12/31 07:20:03 sebastian Exp $ */
+/* $Id: zend_operators.h,v 1.94.2.4.2.12 2008/08/05 20:11:17 stas Exp $ */
#ifndef ZEND_OPERATORS_H
#define ZEND_OPERATORS_H
@@ -220,6 +220,9 @@
char *p = haystack;
char ne = needle[needle_len-1];
+ if(needle_len > end-haystack) {
+ return NULL;
+ }
end -= needle_len;
while (p <= end) {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/explode_bug.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/strings/explode_bug.phpt
+++ php-src/ext/standard/tests/strings/explode_bug.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php