]> granicus.if.org Git - php/commitdiff
Revert "Fixed segfault in ext/standard/tests/strings/bug24208.php"
authorXinchen Hui <laruence@gmail.com>
Mon, 24 Feb 2014 07:04:05 +0000 (15:04 +0800)
committerXinchen Hui <laruence@gmail.com>
Mon, 24 Feb 2014 07:04:05 +0000 (15:04 +0800)
This reverts commit b1fb93b4822b68f7ef1e8f59bc1b3d7630212715.

ext/standard/string.c

index 3eab9a062330010ee2d47e1604efdf6dacb0b0aa..9b8862e454a21b502862e9217c50d230ab764d03 100644 (file)
@@ -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;