diff options
| author | Nikita Popov <nikic@php.net> | 2016-04-29 22:39:21 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-04-29 22:39:21 +0200 |
| commit | 01df044fd54ee6728ef3b10dd073ca6c2750fd77 (patch) | |
| tree | 04b0c21662111b9e598e03ea044c8d496b31570b /Zend/zend_variables.c | |
| parent | d048837a46ca9505fcfd13e6c5c1268e43d5eb4a (diff) | |
| download | php-git-01df044fd54ee6728ef3b10dd073ca6c2750fd77.tar.gz | |
Reset IMMUTABLE flag when copy_ctor'ing AST
Diffstat (limited to 'Zend/zend_variables.c')
| -rw-r--r-- | Zend/zend_variables.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c index 6f2dd0421c..01b68c25a4 100644 --- a/Zend/zend_variables.c +++ b/Zend/zend_variables.c @@ -224,12 +224,8 @@ ZEND_API void ZEND_FASTCALL _zval_copy_ctor_func(zval *zvalue ZEND_FILE_LINE_DC) CHECK_ZVAL_STRING_REL(Z_STR_P(zvalue)); Z_STR_P(zvalue) = zend_string_dup(Z_STR_P(zvalue), 0); } else if (EXPECTED(Z_TYPE_P(zvalue) == IS_CONSTANT_AST)) { - zend_ast_ref *ast = emalloc(sizeof(zend_ast_ref)); - - GC_REFCOUNT(ast) = 1; - GC_TYPE_INFO(ast) = IS_CONSTANT_AST; - ast->ast = zend_ast_copy(Z_ASTVAL_P(zvalue)); - Z_AST_P(zvalue) = ast; + zend_ast *copy = zend_ast_copy(Z_ASTVAL_P(zvalue)); + ZVAL_NEW_AST(zvalue, copy); } } |