Commit 757bc59d0c7 for php
commit 757bc59d0c782d773e9d12c9895a783765c44585
Merge: 56826a0a3be 7b75d71ca3f
Author: David Carlier <devnexen@gmail.com>
Date: Fri Oct 2 11:18:13 2026 +0100
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
Fix GH-24050: gc_collect_white() frees data reachable from a resurrected object
diff --cc Zend/zend_gc.c
index b52a9919bfa,669a009defe..066453552ba
--- a/Zend/zend_gc.c
+++ b/Zend/zend_gc.c
@@@ -1575,8 -1517,11 +1575,11 @@@ tail_call
GC_ADDREF(ht);
if (GC_REF_CHECK_COLOR(ht, GC_WHITE)) {
GC_REF_SET_BLACK(ht);
+ if (!GC_INFO(ht)) {
+ gc_add_garbage((zend_refcounted *)ht);
+ }
for (; n != 0; n--) {
- if (Z_REFCOUNTED_P(zv)) {
+ if (Z_COLLECTABLE_P(zv)) {
ref = Z_COUNTED_P(zv);
GC_ADDREF(ref);
if (GC_REF_CHECK_COLOR(ref, GC_WHITE)) {