Don’t leak deleted iterator when tying hash

diff --git a/pp_sys.c b/pp_sys.c
index 2a7f43e..a41c6d1 100644 (file)
--- a/pp_sys.c
+++ b/pp_sys.c
@@ -861,9 +861,16 @@ PP(pp_tie)
 
     switch(SvTYPE(varsv)) {
        case SVt_PVHV:
+       {
+           HE *entry;
            methname = "TIEHASH";
+           if (HvLAZYDEL(varsv) && (entry = HvEITER((HV *)varsv))) {
+               HvLAZYDEL_off(varsv);
+               hv_free_ent((HV *)varsv, entry);
+           }
            HvEITER_set(MUTABLE_HV(varsv), 0);
            break;
+       }
        case SVt_PVAV:
            methname = "TIEARRAY";
            if (!AvREAL(varsv)) {

diff --git a/t/op/tie.t b/t/op/tie.t
index a997c41..5808a09 100644 (file)
--- a/t/op/tie.t
+++ b/t/op/tie.t
@@ -1289,4 +1289,16 @@ untie @a;
 
 sub T::TIEARRAY { my $s; bless \$s => "T" }
 EXPECT
+########
 
+# NAME Test that tying a hash does not leak a deleted iterator
+# This produced unbalanced string table warnings under
+# PERL_DESTRUCT_LEVEL=2.
+package l {
+    sub TIEHASH{bless[]}
+}
+$h = {foo=>0};
+each %$h;
+delete $$h{foo};
+tie %$h, 'l';
+EXPECT