derick Thu Jun 2 04:29:41 2005 EDT Modified files: /php-src/ext/standard string.c Log: - Fixed memory corruption in stristr(). http://cvs.php.net/diff.php/php-src/ext/standard/string.c?r1=1.437&r2=1.438&ty=u Index: php-src/ext/standard/string.c diff -u php-src/ext/standard/string.c:1.437 php-src/ext/standard/string.c:1.438 --- php-src/ext/standard/string.c:1.437 Tue May 31 08:54:56 2005 +++ php-src/ext/standard/string.c Thu Jun 2 04:29:37 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string.c,v 1.437 2005/05/31 12:54:56 sniper Exp $ */ +/* $Id: string.c,v 1.438 2005/06/02 08:29:37 derick Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -1430,8 +1430,8 @@ if (!Z_STRLEN_PP(needle)) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter."); efree(haystack_orig); - zval_ptr_dtor(haystack); - zval_ptr_dtor(needle); +// zval_ptr_dtor(haystack); +// zval_ptr_dtor(needle); RETURN_FALSE; } @@ -1457,8 +1457,8 @@ RETVAL_FALSE; } - zval_ptr_dtor(haystack); - zval_ptr_dtor(needle); +// zval_ptr_dtor(haystack); +// zval_ptr_dtor(needle); efree(haystack_orig); } /* }}} */
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php