From: Spider.Boardman@Orb.Nashua.NH.US <Spider.Boardman@Orb.Nashua.NH.US>
Date: Fri, 18 Aug 2000 18:41:14 +0000 (-0400)
Subject: Fix a core dump in lib/selfloader under -DDEBUGGING.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=1e6dc0b685b17e94025b09758a184a17aee43b32;p=p5sagit%2Fp5-mst-13.2.git

Fix a core dump in lib/selfloader under -DDEBUGGING.

Subject: PATCH @6698 for [ID 20000817.007] Not OK: perl v5.7.0 +SUIDMAIL +DEVEL6676 on alpha-dec_osf 4.0f (UNINSTALLED)
Message-Id: <200008182241.SAA29667@Orb.Nashua.NH.US>

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

diff --git a/regcomp.c b/regcomp.c
index d2195b0..c13eb26 100644
--- a/regcomp.c
+++ b/regcomp.c
@@ -4372,8 +4372,13 @@ Perl_pregfree(pTHX_ struct regexp *r)
 		    Perl_croak(aTHX_ "panic: pregfree comppad");
 		old_comppad = PL_comppad;
 		old_curpad = PL_curpad;
-		PL_comppad = new_comppad;
-		PL_curpad = AvARRAY(new_comppad);
+		/* Watch out for global destruction's random ordering. */
+		if (SvTYPE(new_comppad) == SVt_PVAV) {
+		    PL_comppad = new_comppad;
+		    PL_curpad = AvARRAY(new_comppad);
+		}
+		else
+		    PL_curpad = NULL;
 		op_free((OP_4tree*)r->data->data[n]);
 		PL_comppad = old_comppad;
 		PL_curpad = old_curpad;