Ensure PL_comppad/curpad point to PL_main_cv's padlist when

PL_main_root is freed; this may not have been be the case if a
thread other than the main one is the last to be destroyed

p4raw-id: //depot/perl@21470

1 files changed, 9 insertions, 2 deletions

diff --git a/pad.h b/pad.h
index cc31777912..e839042722 100644
--- a/pad.h
+++ b/pad.h
@@ -105,6 +105,9 @@ Get the value from slot C<po> in the base (DEPTH=1) pad of a padlist
 Set the current pad to be pad C<n> in the padlist, saving
 the previous current pad.
 
+=for apidoc m|void|PAD_SET_CUR_NOSAVE	|PADLIST padlist|I32 n
+like PAD_SET_CUR, but without the save
+
 =for apidoc m|void|PAD_SAVE_SETNULLPAD
 Save the current pad then set it to null.
 
@@ -133,8 +136,7 @@ Restore the old pad saved into the local variable opad by PAD_SAVE_LOCAL()
 	    ? AvARRAY((AV*)(AvARRAY(padlist)[1]))[po] : Nullsv;
     
 
-#define PAD_SET_CUR(padlist,n) \
-	SAVECOMPPAD();						\
+#define PAD_SET_CUR_NOSAVE(padlist,n) \
 	PL_comppad = (PAD*) (AvARRAY(padlist)[n]);		\
 	PL_curpad = AvARRAY(PL_comppad);			\
 	DEBUG_Xv(PerlIO_printf(Perl_debug_log,			\
@@ -142,6 +144,11 @@ Restore the old pad saved into the local variable opad by PAD_SAVE_LOCAL()
 	      PTR2UV(PL_comppad), PTR2UV(PL_curpad), (int)(n)));
 
 
+#define PAD_SET_CUR(padlist,n) \
+	SAVECOMPPAD();						\
+	PAD_SET_CUR_NOSAVE(padlist,n);
+
+
 #define PAD_SAVE_SETNULLPAD()	SAVECOMPPAD(); \
 	PL_comppad = Null(PAD*); PL_curpad = Null(SV**);	\
 	DEBUG_Xv(PerlIO_printf(Perl_debug_log, "Pad set_null\n"));