diff options
| author | Xinchen Hui <laruence@php.net> | 2012-10-18 16:33:07 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-10-18 16:33:07 +0800 |
| commit | 4d509708a454c736a2f15f1a4ec7567c26659086 (patch) | |
| tree | b32b08cfd9eeb4a81f104c234820cd20b0a23ba4 | |
| parent | 08b9702f8a190876a23f75844978831dd563853e (diff) | |
| download | php-git-4d509708a454c736a2f15f1a4ec7567c26659086.tar.gz | |
I forgot that inconsistent is only avaliable in debug mode
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | Zend/zend_gc.h | 2 |
2 files changed, 1 insertions, 4 deletions
@@ -2,9 +2,6 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2012, PHP 5.4.9 -- Core: - . Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite). (Laruence) - - Fileinfo: . Fixed bug #63248 (Load multiple magic files from a directory under Windows). (Anatoliy) diff --git a/Zend/zend_gc.h b/Zend/zend_gc.h index 1f86f19b71..ba30b3aa3b 100644 --- a/Zend/zend_gc.h +++ b/Zend/zend_gc.h @@ -179,7 +179,7 @@ END_EXTERN_C() static zend_always_inline void gc_zval_check_possible_root(zval *z TSRMLS_DC) { - if ((z->type == IS_ARRAY && !z->value.ht->inconsistent) || z->type == IS_OBJECT) { + if (z->type == IS_ARRAY || z->type == IS_OBJECT) { gc_zval_possible_root(z TSRMLS_CC); } } |