From 3e99a228dfcd0955eb0ee06a93ed34ec645bed69 Mon Sep 17 00:00:00 2001 From: "Thies C. Arntzen" Date: Wed, 22 Mar 2000 08:14:00 +0000 Subject: [PATCH] @- stristr() no longer modifies it's arguments. (Thies) fix #3890 --- ext/standard/string.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ext/standard/string.c b/ext/standard/string.c index 8ccd27616e..ba9a672fd2 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -579,6 +579,9 @@ PHP_FUNCTION(stristr) FAILURE) { WRONG_PARAM_COUNT; } + + SEPARATE_ZVAL(haystack); + SEPARATE_ZVAL(needle); convert_to_string_ex(haystack); if ((*needle)->type == IS_STRING) { @@ -586,12 +589,14 @@ PHP_FUNCTION(stristr) php_error(E_WARNING,"Empty delimiter"); RETURN_FALSE; } + found = php_stristr((*haystack)->value.str.val, (*needle)->value.str.val, (*haystack)->value.str.len, (*needle)->value.str.len); } else { convert_to_long_ex(needle); needle_char[0] = tolower((char) (*needle)->value.lval); needle_char[1] = '\0'; + found = php_stristr((*haystack)->value.str.val, needle_char, (*haystack)->value.str.len, 1); } -- 2.50.1