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

Merge branch 'PHP-7.3' into PHP-7.4

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

6ef08b190334718478f0e6a336771236c421c95b
diff --cc ext/standard/var.c
index 460674a8ed,618b34bea7..79c3b323f6
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@@ -324,9 -304,16 +331,12 @@@ again
  		ZEND_HASH_FOREACH_KEY_VAL_IND(myht, index, key, val) {
  			zval_array_element_dump(val, index, key, level);
  		} ZEND_HASH_FOREACH_END();
- 		if (level > 1 && !(GC_FLAGS(myht) & GC_IMMUTABLE)) {
- 			GC_UNPROTECT_RECURSION(myht);
+ 		if (!(GC_FLAGS(myht) & GC_IMMUTABLE)) {
+ 			if (level > 1) {
+ 				GC_UNPROTECT_RECURSION(myht);
+ 			}
+ 			GC_DELREF(myht);
  		}
 -		if (is_temp) {
 -			zend_hash_destroy(myht);
 -			efree(myht);
 -		}
  		if (level > 1) {
  			php_printf("%*c", level - 1, ' ');
  		}