From: Xinchen Hui Date: Mon, 24 Feb 2014 07:04:05 +0000 (+0800) Subject: Revert "Fixed segfault in ext/standard/tests/strings/bug24208.php" X-Git-Tag: POST_PHPNG_MERGE~412^2~565^2~5 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=737a84ed04e0f2e46fe2cf94abef95e7b480702e;p=php Revert "Fixed segfault in ext/standard/tests/strings/bug24208.php" This reverts commit b1fb93b4822b68f7ef1e8f59bc1b3d7630212715. --- diff --git a/ext/standard/string.c b/ext/standard/string.c index 3eab9a0623..9b8862e454 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -4410,11 +4410,7 @@ PHP_FUNCTION(parse_str) zend_rebuild_symbol_table(TSRMLS_C); } //??? Z_ARRVAL(tmp) = EG(active_symbol_table); - array_init(&tmp); - zend_hash_copy(Z_ARRVAL(tmp), EG(active_symbol_table), zval_add_ref); sapi_module.treat_data(PARSE_STRING, res, &tmp TSRMLS_CC); - zend_hash_copy(EG(active_symbol_table), Z_ARRVAL(tmp), zval_add_ref); - zval_dtor(&tmp); } else { zval ret;