]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.3' into PHP-7.4
authorNikita Popov <nikita.ppv@gmail.com>
Mon, 26 Aug 2019 15:52:56 +0000 (17:52 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Mon, 26 Aug 2019 15:52:56 +0000 (17:52 +0200)
1  2 
Zend/zend_gc.c

diff --cc Zend/zend_gc.c
index 60e128ef19a923bcb0a33cfced916e142e974bb7,3a36a8cc0d7a915e6fa5fcc3a35488c1bb824451..b74a8e79b9298a4b03d190993818279589199da5
@@@ -1379,8 -1400,12 +1379,12 @@@ tail_call
                                        ref = Z_COUNTED_P(zv);
                                        goto tail_call;
                                }
+                               if (GC_REF_ADDRESS(ht) != 0 && GC_REF_CHECK_COLOR(ht, GC_BLACK)) {
+                                       GC_TRACE_REF(ht, "removing from buffer");
+                                       GC_REMOVE_FROM_BUFFER(ht);
+                               }
                        } else {
 -                              return;
 +                              return count;
                        }
                } else if (GC_TYPE(ref) == IS_ARRAY) {
                        ht = (zend_array*)ref;