Avoid taking a reference to SvIVX and putting that address on the

save stack

p4raw-id: //depot/perl@24228

1 files changed, 4 insertions, 3 deletions

diff --git a/pp_ctl.c b/pp_ctl.c
index 71634fbf84..933fb3f013 100644
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -2426,13 +2426,14 @@ PP(pp_goto)
 		    SV *sv = GvSV(PL_DBsub);
 		    CV *gotocv;
 
+		    save_item(sv);
 		    if (PERLDB_SUB_NN) {
-			(void)SvUPGRADE(sv, SVt_PVIV);
+			int type = SvTYPE(sv);
+			if (type < SVt_PVIV && type != SVt_IV)
+			    sv_upgrade(sv, SVt_PVIV);
 			(void)SvIOK_on(sv);
-			SAVEIV(SvIVX(sv));
 			SvIV_set(sv, PTR2IV(cv)); /* Do it the quickest way */
 		    } else {
-			save_item(sv);
 			gv_efullname3(sv, CvGV(cv), Nullch);
 		    }
 		    if (  PERLDB_GOTO