From: Antony Dovgal Date: Fri, 9 Dec 2005 22:26:39 +0000 (+0000) Subject: fix #35617 X-Git-Tag: RELEASE_1_0_4~439 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=749c6e3016ffb25415652c3ccc2dc4e13e061ffa;p=php fix #35617 no need to separate zvals twice --- diff --git a/ext/standard/string.c b/ext/standard/string.c index 2f12e92d4f..601dbc6623 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -2069,8 +2069,7 @@ PHP_FUNCTION(stristr) if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz|b", &haystack, &needle, &part) == FAILURE) { return; } - SEPARATE_ZVAL(&haystack); - SEPARATE_ZVAL(&needle); + if (Z_TYPE_P(haystack) != IS_UNICODE && Z_TYPE_P(haystack) != IS_BINARY && Z_TYPE_P(haystack) != IS_STRING) { convert_to_text(haystack); }