[perl #35214] SEGV when next is followed by a goto

next and redo didn't restore PL_curcop

p4raw-id: //depot/perl@24384

2 files changed, 26 insertions, 1 deletions

diff --git a/pp_ctl.c b/pp_ctl.c
index c4aa30ed72..03a4171e51 100644
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -1890,6 +1890,7 @@ PP(pp_leaveloop)
     SV **mark;
 
     POPBLOCK(cx,newpm);
+    assert(CxTYPE(cx) == CXt_LOOP);
     mark = newsp;
     newsp = PL_stack_base + cx->blk_loop.resetsp;
 
@@ -2149,6 +2150,7 @@ PP(pp_next)
     TOPBLOCK(cx);
     if (PL_scopestack_ix < inner)
 	leave_scope(PL_scopestack[PL_scopestack_ix]);
+    PL_curcop = cx->blk_oldcop;
     return cx->blk_loop.next_op;
 }
 
@@ -2176,6 +2178,7 @@ PP(pp_redo)
     oldsave = PL_scopestack[PL_scopestack_ix - 1];
     LEAVE_SCOPE(oldsave);
     FREETMPS;
+    PL_curcop = cx->blk_oldcop;
     return cx->blk_loop.redo_op;
 }
 
diff --git a/t/op/goto.t b/t/op/goto.t
index 3b921238f2..806dbed674 100755
--- a/t/op/goto.t
+++ b/t/op/goto.t
@@ -7,7 +7,7 @@ BEGIN {
     @INC = qw(. ../lib);
 }
 
-print "1..47\n";
+print "1..49\n";
 
 require "test.pl";
 
@@ -414,5 +414,27 @@ sub b32039 { goto &c32039; }
 sub c32039 { print $_[0] eq 'foo' ? "" : "not ", "ok 47 - chained &goto\n" }
 a32039();
 
+# [perl #35214] next and redo re-entered the loop with the wrong cop,
+# causing a subsequent goto to crash
+
+{
+    my $r = runperl(
+		stderr => 1,
+		prog =>
+'for ($_=0;$_<3;$_++){A: if($_==1){next} if($_==2){$_++;goto A}}print qq(ok)'
+    );
+    $r =~ s/\n//g;
+    print "# r=$r\nnot " unless $r eq 'ok';
+    print "ok 48 - next and goto\n";
+
+    $r = runperl(
+		stderr => 1,
+		prog =>
+'for ($_=0;$_<3;$_++){A: if($_==1){$_++;redo} if($_==2){$_++;goto A}}print qq(ok)'
+    );
+    $r =~ s/\n//g;
+    print "# r=$r\nnot " unless $r eq 'ok';
+    print "ok 49 - redo and goto\n";
+}