derick Thu Jun 2 04:31:39 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard string.c
/php-src NEWS
Log:
- MFH: Fixed memory corruption in stristr().
http://cvs.php.net/diff.php/php-src/ext/standard/string.c?r1=1.333.2.50&r2=1.333.2.51&ty=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.333.2.50
php-src/ext/standard/string.c:1.333.2.51
--- php-src/ext/standard/string.c:1.333.2.50 Tue May 31 08:56:00 2005
+++ php-src/ext/standard/string.c Thu Jun 2 04:31:38 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.333.2.50 2005/05/31 12:56:00 sniper Exp $ */
+/* $Id: string.c,v 1.333.2.51 2005/06/02 08:31:38 derick Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -1317,8 +1317,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;
}
@@ -1339,8 +1339,8 @@
RETVAL_FALSE;
}
- zval_ptr_dtor(haystack);
- zval_ptr_dtor(needle);
+// zval_ptr_dtor(haystack);
+// zval_ptr_dtor(needle);
efree(haystack_orig);
}
/* }}} */
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.916&r2=1.1247.2.917&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.916 php-src/NEWS:1.1247.2.917
--- php-src/NEWS:1.1247.2.916 Wed Jun 1 18:29:19 2005
+++ php-src/NEWS Thu Jun 2 04:31:38 2005
@@ -7,6 +7,7 @@
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)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
