From: twosee <twose@qq.com>
Date: Sat, 11 Jul 2020 06:40:17 +0000 (+0800)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=40efb7ad615f8bbe7498b5da2801b3338619f9d6;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed bug #79830 introduced by fixing bug #79821

# Conflicts:
#	ext/standard/var.c
---

40efb7ad615f8bbe7498b5da2801b3338619f9d6
diff --cc ext/standard/var.c
index 761abbe39b,79c3b323f6..a991ec8cf6
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@@ -137,7 -143,10 +136,8 @@@ again
  				php_array_element_dump(val, num, key, level);
  			} ZEND_HASH_FOREACH_END();
  			if (!(GC_FLAGS(myht) & GC_IMMUTABLE)) {
 -				if (level > 1) {
 -					GC_UNPROTECT_RECURSION(myht);
 -				}
 +				GC_UNPROTECT_RECURSION(myht);
+ 				GC_DELREF(myht);
  			}
  			if (level > 1) {
  				php_printf("%*c", level-1, ' ');