diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-08-09 17:47:06 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-08-09 17:47:06 +0300 |
| commit | 722a44d51565007c443e099e8516984a90863997 (patch) | |
| tree | 5ead8f2ce84907a3fa3a0b44c509907f64e927d2 | |
| parent | 22d23e08c927f07b0bc7ed72dbfc3d8ea79bed7c (diff) | |
| parent | 9b43e29d9b55eafb4e063a0b2d817356f5b908b5 (diff) | |
| download | php-git-722a44d51565007c443e099e8516984a90863997.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed handling of references in nested data of objects with destructor
| -rw-r--r-- | Zend/tests/gc_041.phpt | 35 | ||||
| -rw-r--r-- | Zend/zend_gc.c | 26 |
2 files changed, 49 insertions, 12 deletions
diff --git a/Zend/tests/gc_041.phpt b/Zend/tests/gc_041.phpt new file mode 100644 index 0000000000..7400e23756 --- /dev/null +++ b/Zend/tests/gc_041.phpt @@ -0,0 +1,35 @@ +--TEST-- +GC 041: Handling of references in nested data of objects with destructor +--INI-- +zend.enable_gc = 1 +--FILE-- +<?php +class ryat { + var $ryat; + var $chtg; + var $nested; + function __destruct() { + $GLOBALS['x'] = $this; + } +} +$o = new ryat; +$o->nested = []; +$o->nested[] =& $o->nested; +$o->ryat = $o; +$x =& $o->chtg; +unset($o); +gc_collect_cycles(); +var_dump($x); +?> +--EXPECT-- +object(ryat)#1 (3) { + ["ryat"]=> + *RECURSION* + ["chtg"]=> + *RECURSION* + ["nested"]=> + &array(1) { + [0]=> + *RECURSION* + } +}
\ No newline at end of file diff --git a/Zend/zend_gc.c b/Zend/zend_gc.c index d1fcbf00ca..b6510153f0 100644 --- a/Zend/zend_gc.c +++ b/Zend/zend_gc.c @@ -1350,16 +1350,24 @@ static void gc_remove_nested_data_from_buffer(zend_refcounted *ref, gc_root_buff 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"); gc_remove_from_roots(root); GC_REF_SET_INFO(ref, 0); root = NULL; - } else { + } 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) { @@ -1397,12 +1405,6 @@ tail_call: } } else if (GC_TYPE(ref) == IS_ARRAY) { ht = (zend_array*)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; } @@ -1438,7 +1440,7 @@ tail_call: } ref = Z_COUNTED_P(zv); goto tail_call; - } + } while (0); } ZEND_API int zend_gc_collect_cycles(void) |