php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-26 09:12:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

@- stristr() no longer modifies it's arguments. (Thies)

Browse Source 
fix #3890
This commit is contained in:
Thies C. Arntzen
2000-03-22 08:14:00 +00:00
parent 7c003f8c0c
commit 3e99a228df
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ext/standard/string.c
View File

@@ -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);
}