]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.3' into PHP-7.4
authortwosee <twose@qq.com>
Sat, 11 Jul 2020 06:38:27 +0000 (14:38 +0800)
committertwosee <twose@qq.com>
Sat, 11 Jul 2020 06:38:27 +0000 (14:38 +0800)
* PHP-7.3:
  Fixed bug #79830 introduced by fixing bug #79821

1  2 
ext/standard/var.c

index 460674a8ed1ade63c2848a4e3111d7d3cbf1761a,618b34bea7715c8b15379b6ba886dc700d984eb9..79c3b323f6cf0ce578727daee87dde01d4f7bced
@@@ -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, ' ');
                }