com php-src: I forgot that inconsistent is only avaliable in debug mode: NEWS Zend/zend_gc.h
| From: | Xinchen Hui | Date: | Thu, 18 Oct 2012 08:33:07 +0000 |
| Subject: | com php-src: I forgot that inconsistent is only avaliable in debug mode: NEWS Zend/zend_gc.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-70417@lists.php.net to get a copy of this message | ||
Commit: 4d509708a454c736a2f15f1a4ec7567c26659086
Author: Xinchen Hui <laruence@php.net> Thu, 18 Oct 2012 16:33:07 +0800
Parents: 08b9702f8a190876a23f75844978831dd563853e
Branches: PHP-5.4
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4d509708a454c736a2f15f1a4ec7567c26659086
Log:
I forgot that inconsistent is only avaliable in debug mode
Changed paths:
M NEWS
M Zend/zend_gc.h
Diff:
diff --git a/NEWS b/NEWS
index 06bdf3d..eca6698 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 1f86f19..ba30b3a 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);
}
}