com php-src: Fixed segfault: Zend/zend_variables.c
| From: | Xinchen Hui | Date: | Wed, 23 Jul 2014 03:05:03 +0000 |
| Subject: | com php-src: Fixed segfault: Zend/zend_variables.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79650@lists.php.net to get a copy of this message | ||
Commit: 5fb31215cbc7063874a03465161f07856a84dd5c
Author: Xinchen Hui <laruence@php.net> Wed, 23 Jul 2014 11:05:03 +0800
Parents: 6cc487df2c464224e28c3869599e0c110df03897
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5fb31215cbc7063874a03465161f07856a84dd5c
Log:
Fixed segfault
Changed paths:
M Zend/zend_variables.c
Diff:
diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c
index b512c45..9f76d9f 100644
--- a/Zend/zend_variables.c
+++ b/Zend/zend_variables.c
@@ -44,8 +44,8 @@ ZEND_API void _zval_dtor_func(zend_refcounted *p ZEND_FILE_LINE_DC)
if (arr != &EG(symbol_table)) {
/* break possible cycles */
GC_TYPE(arr) = IS_NULL;
- zend_hash_destroy(&arr->ht);
GC_REMOVE_FROM_BUFFER(arr);
+ zend_hash_destroy(&arr->ht);
efree(arr);
}
break;
@@ -104,8 +104,8 @@ ZEND_API void _zval_dtor_func_for_ptr(zend_refcounted *p ZEND_FILE_LINE_DC)
if (arr != &EG(symbol_table)) {
/* break possible cycles */
GC_TYPE(arr) = IS_NULL;
- zend_hash_destroy(&arr->ht);
GC_REMOVE_FROM_BUFFER(arr);
+ zend_hash_destroy(&arr->ht);
efree(arr);
}
break;