Prevent premature death of @_ during leavesub

1 files changed, 4 insertions, 1 deletions

diff --git a/pp_hot.c b/pp_hot.c
index 707239fb1b..120c026b4b 100644
--- a/pp_hot.c
+++ b/pp_hot.c
@@ -1656,7 +1656,7 @@ PP(pp_leavesub)
     register CONTEXT *cx;
 
     POPBLOCK(cx,newpm);
-    POPSUB(cx);
+    /* Delay POPSUB until stack values are safe */
 
     if (gimme == G_SCALAR) {
 	MARK = newsp + 1;
@@ -1678,6 +1678,9 @@ PP(pp_leavesub)
 		/* in case LEAVE wipes old return values */
     }
 
+    /* Now that stack values are safe, release CV and @_ */
+    POPSUB(cx);
+
     curpm = newpm;	/* Don't pop $1 et al till now */
 
     LEAVE;