cvs: php-src /ext/standard string.c
| From: | Antony Dovgal | Date: | Thu, 10 Jan 2008 14:31:11 +0000 |
| Subject: | cvs: php-src /ext/standard string.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-47771@lists.php.net to get a copy of this message | ||
tony2001 Thu Jan 10 14:31:11 2008 UTC
Modified files:
/php-src/ext/standard string.c
Log:
fix #43750 (stristr() modifies string)
patch by Felipe Pena
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.659&r2=1.660&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.659 php-src/ext/standard/string.c:1.660
--- php-src/ext/standard/string.c:1.659 Mon Dec 31 07:12:16 2007
+++ php-src/ext/standard/string.c Thu Jan 10 14:31:11 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.659 2007/12/31 07:12:16 sebastian Exp $ */
+/* $Id: string.c,v 1.660 2008/01/10 14:31:11 tony2001 Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -2526,6 +2526,9 @@
return;
}
+ SEPARATE_ZVAL(haystack);
+ SEPARATE_ZVAL(needle);
+
if (Z_TYPE_PP(haystack) != IS_UNICODE && Z_TYPE_PP(haystack) != IS_STRING) {
convert_to_text_ex(haystack);
}