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

# Conflicts:
# ext/standard/var.c

1  2 
ext/standard/var.c

index 761abbe39b2e4661049caab6bc7f27448a70488a,79c3b323f6cf0ce578727daee87dde01d4f7bced..a991ec8cf657ec71483d6d1a08b62edb2fc814ec
@@@ -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, ' ');