This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Re-initialise PL_curcop to &PL_compiling before destroying the optree.
authorNicholas Clark <nick@ccl4.org>
Thu, 23 Jun 2005 10:41:00 +0000 (10:41 +0000)
committerNicholas Clark <nick@ccl4.org>
Thu, 23 Jun 2005 10:41:00 +0000 (10:41 +0000)
p4raw-id: //depot/perl@24952

perl.c

diff --git a/perl.c b/perl.c
index f8fd6d3..838f911 100644 (file)
--- a/perl.c
+++ b/perl.c
@@ -507,6 +507,11 @@ perl_destruct(pTHXx)
     /* We must account for everything.  */
 
     /* Destroy the main CV and syntax tree */
+    /* Do this now, because destroying ops can cause new SVs to be generated
+       in Perl_pad_swipe, and when running with -DDEBUG_LEAKING_SCALARS they
+       PL_curcop to point to a valid op from which the filename structure
+       member is copied.  */
+    PL_curcop = &PL_compiling;
     if (PL_main_root) {
        /* ensure comppad/curpad to refer to main's pad */
        if (CvPADLIST(PL_main_cv)) {
@@ -515,7 +520,6 @@ perl_destruct(pTHXx)
        op_free(PL_main_root);
        PL_main_root = Nullop;
     }
-    PL_curcop = &PL_compiling;
     PL_main_start = Nullop;
     SvREFCNT_dec(PL_main_cv);
     PL_main_cv = Nullcv;