From: Tim Bunce <Tim.Bunce@pobox.com>
Date: Fri, 12 Jul 2002 17:25:09 +0000 (+0100)
Subject: Core dump in perl_clone (even with 'use threads;' first) [PATCH]
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=389edf32390606e5c67e324a614e68d6ca3c6f81;p=p5sagit%2Fp5-mst-13.2.git

Core dump in perl_clone (even with 'use threads;' first) [PATCH]
Message-ID: <20020712172509.B568@dansat.data-plan.com>

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

diff --git a/sv.c b/sv.c
index 076ea5c..9a287af 100644
--- a/sv.c
+++ b/sv.c
@@ -10152,16 +10152,24 @@ perl_clone_using(PerlInterpreter *proto_perl, UV flags,
     Copy(proto_perl->Inexttype, PL_nexttype, 5,	I32);
     PL_nexttoke		= proto_perl->Inexttoke;
 
-    PL_linestr		= sv_dup_inc(proto_perl->Ilinestr, param);
-    i = proto_perl->Ibufptr - SvPVX(proto_perl->Ilinestr);
-    PL_bufptr		= SvPVX(PL_linestr) + (i < 0 ? 0 : i);
-    i = proto_perl->Ioldbufptr - SvPVX(proto_perl->Ilinestr);
-    PL_oldbufptr	= SvPVX(PL_linestr) + (i < 0 ? 0 : i);
-    i = proto_perl->Ioldoldbufptr - SvPVX(proto_perl->Ilinestr);
-    PL_oldoldbufptr	= SvPVX(PL_linestr) + (i < 0 ? 0 : i);
+    if (SvANY(proto_perl->Ilinestr)) {
+	PL_linestr		= sv_dup_inc(proto_perl->Ilinestr, param);
+	i = proto_perl->Ibufptr - SvPVX(proto_perl->Ilinestr);
+	PL_bufptr		= SvPVX(PL_linestr) + (i < 0 ? 0 : i);
+	i = proto_perl->Ioldbufptr - SvPVX(proto_perl->Ilinestr);
+	PL_oldbufptr	= SvPVX(PL_linestr) + (i < 0 ? 0 : i);
+	i = proto_perl->Ioldoldbufptr - SvPVX(proto_perl->Ilinestr);
+	PL_oldoldbufptr	= SvPVX(PL_linestr) + (i < 0 ? 0 : i);
+	i = proto_perl->Ilinestart - SvPVX(proto_perl->Ilinestr);
+	PL_linestart	= SvPVX(PL_linestr) + (i < 0 ? 0 : i);
+    }
+    else {
+        PL_linestr = NEWSV(65,79);
+        sv_upgrade(PL_linestr,SVt_PVIV);
+        sv_setpvn(PL_linestr,"",0);
+	PL_bufptr = PL_oldbufptr = PL_oldoldbufptr = PL_linestart = SvPVX(PL_linestr);
+    }
     PL_bufend		= SvPVX(PL_linestr) + SvCUR(PL_linestr);
-    i = proto_perl->Ilinestart - SvPVX(proto_perl->Ilinestr);
-    PL_linestart	= SvPVX(PL_linestr) + (i < 0 ? 0 : i);
     PL_pending_ident	= proto_perl->Ipending_ident;
     PL_sublex_info	= proto_perl->Isublex_info;	/* XXX not quite right */
 
@@ -10182,11 +10190,18 @@ perl_clone_using(PerlInterpreter *proto_perl, UV flags,
     PL_padix_floor		= proto_perl->Ipadix_floor;
     PL_pad_reset_pending	= proto_perl->Ipad_reset_pending;
 
-    i = proto_perl->Ilast_uni - SvPVX(proto_perl->Ilinestr);
-    PL_last_uni		= SvPVX(PL_linestr) + (i < 0 ? 0 : i);
-    i = proto_perl->Ilast_lop - SvPVX(proto_perl->Ilinestr);
-    PL_last_lop		= SvPVX(PL_linestr) + (i < 0 ? 0 : i);
-    PL_last_lop_op	= proto_perl->Ilast_lop_op;
+    if (SvANY(proto_perl->Ilinestr)) {
+	i = proto_perl->Ilast_uni - SvPVX(proto_perl->Ilinestr);
+	PL_last_uni		= SvPVX(PL_linestr) + (i < 0 ? 0 : i);
+	i = proto_perl->Ilast_lop - SvPVX(proto_perl->Ilinestr);
+	PL_last_lop		= SvPVX(PL_linestr) + (i < 0 ? 0 : i);
+	PL_last_lop_op	= proto_perl->Ilast_lop_op;
+    }
+    else {
+	PL_last_uni	= SvPVX(PL_linestr);
+	PL_last_lop	= SvPVX(PL_linestr);
+	PL_last_lop_op	= 0;
+    }
     PL_in_my		= proto_perl->Iin_my;
     PL_in_my_stash	= hv_dup(proto_perl->Iin_my_stash, param);
 #ifdef FCRYPT