diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2014-05-06 14:59:03 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2014-05-06 14:59:03 +0200 |
| commit | f3c1881f1dc19cb8bd0ddf0c85ecee390fde526f (patch) | |
| tree | 934de216616cd989c2da5c5d05a0e4a0ed6a4f91 /Zend/zend_variables.c | |
| parent | 485a60414de3b64e274aa60c93496d8bbfa2d8e5 (diff) | |
| download | php-git-f3c1881f1dc19cb8bd0ddf0c85ecee390fde526f.tar.gz | |
Re-added fix for bug #66015 and adapted for phpng branch
Diffstat (limited to 'Zend/zend_variables.c')
| -rw-r--r-- | Zend/zend_variables.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c index c05e404c06..64bd1ae844 100644 --- a/Zend/zend_variables.c +++ b/Zend/zend_variables.c @@ -37,10 +37,9 @@ ZEND_API void _zval_dtor_func(zend_refcounted *p ZEND_FILE_LINE_DC) STR_RELEASE(str); break; } - case IS_ARRAY: - case IS_CONSTANT_ARRAY: { - zend_array *arr =(zend_array*)p; + case IS_ARRAY: { TSRMLS_FETCH(); + zend_array *arr = (zend_array*)p; if (arr != &EG(symbol_table)) { /* break possible cycles */ @@ -52,7 +51,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); @@ -98,8 +97,7 @@ ZEND_API void _zval_dtor_func_for_ptr(zend_refcounted *p ZEND_FILE_LINE_DC) STR_FREE(str); break; } - case IS_ARRAY: - case IS_CONSTANT_ARRAY: { + case IS_ARRAY: { zend_array *arr =(zend_array*)p; TSRMLS_FETCH(); @@ -155,7 +153,6 @@ 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: @@ -187,7 +184,6 @@ 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: @@ -240,8 +236,7 @@ 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_CONSTANT_ARRAY: { + case IS_ARRAY: { HashTable *ht; TSRMLS_FETCH(); |