[PHP-CVS] cvs: php-src /ext/standard string.c

[Antony Dovgal]

tony2001                Fri Dec  9 17:26:44 2005 EDT

  Modified files:              
    /php-src/ext/standard       string.c 
  Log:
  fix #35617
  no need to separate zvals twice
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/string.c?r1=1.509&r2=1.510&ty=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.509 php-src/ext/standard/string.c:1.510
--- php-src/ext/standard/string.c:1.509 Fri Dec  9 08:41:06 2005
+++ php-src/ext/standard/string.c       Fri Dec  9 17:26:39 2005
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: string.c,v 1.509 2005/12/09 13:41:06 dmitry Exp $ */
+/* $Id: string.c,v 1.510 2005/12/09 22:26:39 tony2001 Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -2069,8 +2069,7 @@
        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);
        }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php