com php-src: Revert "Fixed segfault in ext/standard/tests/strings/bug24208.php": ext/standard/string.c

From: Date: Mon, 24 Feb 2014 07:04:05 +0000
Subject: com php-src: Revert "Fixed segfault in ext/standard/tests/strings/bug24208.php": ext/standard/string.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-77996@lists.php.net to get a copy of this message
Commit: 737a84ed04e0f2e46fe2cf94abef95e7b480702e Author: Xinchen Hui <laruence@gmail.com> Mon, 24 Feb 2014 15:04:05 +0800 Parents: 6f6573ef6aebeafd3282191cf4e250a6df675791 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=737a84ed04e0f2e46fe2cf94abef95e7b480702e Log: Revert "Fixed segfault in ext/standard/tests/strings/bug24208.php" This reverts commit b1fb93b4822b68f7ef1e8f59bc1b3d7630212715. Bugs: https://bugs.php.net/24208 Changed paths: M ext/standard/string.c Diff: diff --git a/ext/standard/string.c b/ext/standard/string.c index 3eab9a0..9b8862e 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;

« previous php.cvs (#77996) next »