summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rw-r--r--Zend/zend_gc.h2
2 files changed, 1 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 06bdf3dbbe..eca66987eb 100644
--- a/NEWS
+++ b/NEWS
@@ -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);
}
}