diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-05-07 03:26:13 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-05-07 03:26:13 +0400 |
| commit | 4ecc52797650c882f3101edd7171007ac0d15ec7 (patch) | |
| tree | 8bc98bd380f7efc9b74bf2f50498f9bd2e22f8dc /Zend/zend_variables.c | |
| parent | 424aebbf3643b3fc1b1074ecddf2104cb9465f02 (diff) | |
| download | php-git-4ecc52797650c882f3101edd7171007ac0d15ec7.tar.gz | |
Reverted Bob's patch (it breaks many tests when run with opcache and needs to be fixed first).
Diffstat (limited to 'Zend/zend_variables.c')
| -rw-r--r-- | Zend/zend_variables.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c index 64bd1ae844..c05e404c06 100644 --- a/Zend/zend_variables.c +++ b/Zend/zend_variables.c @@ -37,9 +37,10 @@ ZEND_API void _zval_dtor_func(zend_refcounted *p ZEND_FILE_LINE_DC) STR_RELEASE(str); break; } - case IS_ARRAY: { + case IS_ARRAY: + case IS_CONSTANT_ARRAY: { + zend_array *arr =(zend_array*)p; TSRMLS_FETCH(); - zend_array *arr = (zend_array*)p; if (arr != &EG(symbol_table)) { /* break possible cycles */ @@ -51,7 +52,7 @@ ZEND_API void _zval_dtor_func(zend_refcounted *p ZEND_FILE_LINE_DC) break; } case IS_CONSTANT_AST: { - zend_ast_ref *ast = (zend_ast_ref*)p; + zend_ast_ref *ast =(zend_ast_ref*)p; zend_ast_destroy(ast->ast); efree(ast); @@ -97,7 +98,8 @@ ZEND_API void _zval_dtor_func_for_ptr(zend_refcounted *p ZEND_FILE_LINE_DC) STR_FREE(str); break; } - case IS_ARRAY: { + case IS_ARRAY: + case IS_CONSTANT_ARRAY: { zend_array *arr =(zend_array*)p; TSRMLS_FETCH(); @@ -153,6 +155,7 @@ ZEND_API void _zval_internal_dtor(zval *zvalue ZEND_FILE_LINE_DC) STR_RELEASE(Z_STR_P(zvalue)); break; case IS_ARRAY: + case IS_CONSTANT_ARRAY: case IS_CONSTANT_AST: case IS_OBJECT: case IS_RESOURCE: @@ -184,6 +187,7 @@ ZEND_API void _zval_internal_dtor_for_ptr(zval *zvalue ZEND_FILE_LINE_DC) STR_FREE(Z_STR_P(zvalue)); break; case IS_ARRAY: + case IS_CONSTANT_ARRAY: case IS_CONSTANT_AST: case IS_OBJECT: case IS_RESOURCE: @@ -236,7 +240,8 @@ ZEND_API void _zval_copy_ctor_func(zval *zvalue ZEND_FILE_LINE_DC) CHECK_ZVAL_STRING_REL(Z_STR_P(zvalue)); Z_STR_P(zvalue) = STR_DUP(Z_STR_P(zvalue), 0); break; - case IS_ARRAY: { + case IS_ARRAY: + case IS_CONSTANT_ARRAY: { HashTable *ht; TSRMLS_FETCH(); |