diff options
| author | Anatol Belski <ab@php.net> | 2015-01-22 12:29:03 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-01-22 12:29:03 +0100 |
| commit | 53d01c4580408e440eef19a3fd6bee12f5b51786 (patch) | |
| tree | 93414d039595784c136741eead48a30185cabc9f | |
| parent | d2a4940bd2432092fbd409248c2de6e099fb19f5 (diff) | |
| parent | e21fefde381cdd64dc93116440f3ee159c721fa1 (diff) | |
| download | php-git-53d01c4580408e440eef19a3fd6bee12f5b51786.tar.gz | |
Merge branch 'master' of git.php.net:php-src
| -rw-r--r-- | Zend/zend_gc.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Zend/zend_gc.c b/Zend/zend_gc.c index 2c3ea15320..da547543e3 100644 --- a/Zend/zend_gc.c +++ b/Zend/zend_gc.c @@ -137,6 +137,11 @@ ZEND_API void gc_init(void) ZEND_API void gc_possible_root(zend_refcounted *ref) { + if (GC_TYPE(ref) == IS_NULL) { + return; + } + + ZEND_ASSERT(GC_TYPE(ref) == IS_ARRAY || GC_TYPE(ref) == IS_OBJECT); GC_BENCH_INC(zval_possible_root); if (EXPECTED(GC_GET_COLOR(GC_INFO(ref)) == GC_BLACK)) { |