From: Dmitry Stogov <dmitry@zend.com>
Date: Fri, 9 Aug 2019 14:47:06 +0000 (+0300)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.3.9RC1~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=722a44d51565007c443e099e8516984a90863997;p=php

Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fixed handling of references in nested data of objects with destructor
---

722a44d51565007c443e099e8516984a90863997
diff --cc Zend/zend_gc.c
index d1fcbf00ca,d98598cc48..b6510153f0
--- a/Zend/zend_gc.c
+++ b/Zend/zend_gc.c
@@@ -1350,16 -953,28 +1350,24 @@@ static void gc_remove_nested_data_from_
  	zval *zv;
  
  tail_call:
- 	if (root ||
- 	    (GC_REF_ADDRESS(ref) != 0 &&
- 	     GC_REF_CHECK_COLOR(ref, GC_BLACK))) {
- 		GC_TRACE_REF(ref, "removing from buffer");
+ 	do {
  		if (root) {
+ 			GC_TRACE_REF(ref, "removing from buffer");
 -			if (EXPECTED(GC_ADDRESS(GC_INFO(root->ref)) < GC_ROOT_BUFFER_MAX_ENTRIES)) {
 -				gc_remove_from_roots(root);
 -			} else {
 -				gc_remove_from_additional_roots(root);
 -			}
 -			GC_INFO(ref) = 0;
 +			gc_remove_from_roots(root);
 +			GC_REF_SET_INFO(ref, 0);
  			root = NULL;
- 		} else {
 -		} else if (GC_ADDRESS(GC_INFO(ref)) != 0
 -		 && GC_REF_GET_COLOR(ref) == GC_BLACK) {
++		} else if (GC_REF_ADDRESS(ref) != 0
++		 && GC_REF_CHECK_COLOR(ref, GC_BLACK)) {
+ 			GC_TRACE_REF(ref, "removing from buffer");
  			GC_REMOVE_FROM_BUFFER(ref);
+ 		} else if (GC_TYPE(ref) == IS_REFERENCE) {
+ 			if (Z_REFCOUNTED(((zend_reference*)ref)->val)) {
+ 				ref = Z_COUNTED(((zend_reference*)ref)->val);
+ 				goto tail_call;
+ 			}
+ 			return;
+ 		} else {
+ 			return;
  		}
  
  		if (GC_TYPE(ref) == IS_OBJECT) {