stas Tue Aug 5 20:14:27 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/strings explode_bug.phpt
Modified files: /ZendEngine2 zend_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.10.2.9&r2=1.94.2.4.2.10.2.10&diff_format=u Index: ZendEngine2/zend_operators.h diff -u ZendEngine2/zend_operators.h:1.94.2.4.2.10.2.9 ZendEngine2/zend_operators.h:1.94.2.4.2.10.2.10 --- ZendEngine2/zend_operators.h:1.94.2.4.2.10.2.9 Thu Jul 24 20:39:48 2008 +++ ZendEngine2/zend_operators.h Tue Aug 5 20:14:27 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_operators.h,v 1.94.2.4.2.10.2.9 2008/07/24 20:39:48 moriyoshi Exp $ */ +/* $Id: zend_operators.h,v 1.94.2.4.2.10.2.10 2008/08/05 20:14:27 stas Exp $ */ #ifndef ZEND_OPERATORS_H #define ZEND_OPERATORS_H @@ -224,6 +224,10 @@ return (char *)memchr(p, *needle, (end-p)); } + 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