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, 4 insertions, 0 deletions

diff --git a/perl.c b/perl.c
index c707900a54..889b49326e 100644
--- a/perl.c
+++ b/perl.c
@@ -354,6 +354,10 @@ perl_destruct(pTHXx)
 
     /* Destroy the main CV and syntax tree */
     if (PL_main_root) {
+	/* ensure comppad/curpad to refer to main's pad */
+	if (CvPADLIST(PL_main_cv)) {
+	    PAD_SET_CUR_NOSAVE(CvPADLIST(PL_main_cv), 1);
+	}
 	op_free(PL_main_root);
 	PL_main_root = Nullop;
     }