From 0d3b976c03f8ffe046c80090561fd72040a28234 Mon Sep 17 00:00:00 2001 From: Derick Rethans Date: Thu, 2 Jun 2005 08:31:38 +0000 Subject: - MFH: Fixed memory corruption in stristr(). --- NEWS | 1 + ext/standard/string.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index e643084f01..44fd1911a6 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,7 @@ PHP 4 NEWS them sort based on the current locale. (Derick) - Changed sha1_file() and md5_file() functions to use streams instead of low level IO. (Uwe) +- Fixed memory corruption in stristr(). (Derick) - Fixed bug #33210 (relax jpeg recursive loop protection). (Ilia) - Fixed bug #33200 (preg_replace(): magic_quotes_sybase=On makes 'e' modifier misbehave). (Jani) diff --git a/ext/standard/string.c b/ext/standard/string.c index 94e1d371cc..3e8fdacd43 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -1317,8 +1317,8 @@ PHP_FUNCTION(stristr) 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; } @@ -1339,8 +1339,8 @@ PHP_FUNCTION(stristr) RETVAL_FALSE; } - zval_ptr_dtor(haystack); - zval_ptr_dtor(needle); +// zval_ptr_dtor(haystack); +// zval_ptr_dtor(needle); efree(haystack_orig); } /* }}} */ -- cgit v1.2.1