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

next and redo didn't restore PL_curcop

p4raw-id: //depot/perl@24384

1 files changed, 3 insertions, 0 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;
 }