From: Nicholas Clark <nick@ccl4.org>
Date: Wed, 10 Jan 2007 16:24:27 +0000 (+0000)
Subject: An implementation of change 29735 for blead (PL_curcop could be NULL)
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=1df5f7c19502d9913cf1f60730ae040812453f58;p=p5sagit%2Fp5-mst-13.2.git

An implementation of change 29735 for blead (PL_curcop could be NULL)
given that blead's refactoring is not yet in maint.

p4raw-id: //depot/perl@29748
---

diff --git a/gv.c b/gv.c
index 9f9b0d3..e4c59b5 100644
--- a/gv.c
+++ b/gv.c
@@ -161,7 +161,8 @@ GP *
 Perl_newGP(pTHX_ GV *const gv)
 {
     GP *gp;
-    const char *const file = CopFILE(PL_curcop) ? CopFILE(PL_curcop) : "";
+    const char *const file
+	= (PL_curcop && CopFILE(PL_curcop)) ? CopFILE(PL_curcop) : "";
     STRLEN len = strlen(file);
     U32 hash;
 
@@ -173,7 +174,7 @@ Perl_newGP(pTHX_ GV *const gv)
     gp->gv_sv = newSV(0);
 #endif
 
-    gp->gp_line = CopLINE(PL_curcop);
+    gp->gp_line = PL_curcop ? CopLINE(PL_curcop) : 0;
     /* XXX Ideally this cast would be replaced with a change to const char*
        in the struct.  */
     gp->gp_file_hek = share_hek(file, len, hash);