Integrate:

[ 33553]
Subject: [PATCH] apidoc mismatch for Perl_magic_clearhint
From: Vincent Pit <perl@profvince.com>
Date: Mon, 24 Mar 2008 21:30:10 +0100
Message-ID: <47E80F52.4030805@profvince.com>

[ 33554]
Subject: [PATCH] IO::Socket::INET unnecessarily resolves "udp"
From: Niko Tyni <ntyni@debian.org>
Date: Mon, 24 Mar 2008 23:32:24 +0200
Message-Id: <1206394344-30835-1-git-send-email-ntyni@debian.org>

[ 33556]
Subject: [PATCH] borg parent.pm
From: "Yitzchak Scott-Thoennes" <sthoenna@efn.org>
Date: Wed, 5 Mar 2008 17:19:32 -0800 (PST)
Message-ID: <57512.71.32.86.11.1204766372.squirrel@webmail.efn.org>

Plus bump base.pm's version to a non-alpha number

[ 33557]
Subject: Re: [PATCH] Double warning with perl -we 'my $a; substr $a, 0, 10,
From: Vincent Pit <perl@profvince.com>
Date: Sat, 22 Mar 2008 13:37:42 +0100
Message-ID: <47E4FD96.6080304@profvince.com>

[ 33560]
Use sv_setpvs() like a few lines before since change #33557

[ 33584]
Subject: [PATCH] MAD dump xml escape regex
From: Gerard Goossen <gerard@tty.nl>
Date: Thu, 27 Mar 2008 13:55:31 +0100
Message-ID: <20080327125531.GN4409@ostwald>

[ 33594]
Subject: [PATCH] Re: Tests failed on PPC64
From: Dominic Dunlop <shouldbedomo@mac.com>
Message-Id: <53E6407E-B87C-4D6A-A6E7-D842BDF30292@mac.com>
Date: Fri, 14 Mar 2008 14:45:39 +0100

[ 33608]
Subject: [PATCH] add -v to regen.pl and friends
From: "Robin Barker" <Robin.Barker@npl.co.uk>
Date: Wed, 19 Mar 2008 10:55:59 -0000
Message-ID: <46A0F33545E63740BC7563DE59CA9C6D093AA6@exchsvr2.npl.ad.local>
p4raw-link: @33608 on //depot/perl: 95aa056551f52c584698ab9faf16c6e993f2d2a5
p4raw-link: @33594 on //depot/perl: 02eafbe222bf49be10da28fb9c8c34dd786eaa91
p4raw-link: @33584 on //depot/perl: 643e696a61334e453a6ab25a83a9625db27387ac
p4raw-link: @33560 on //depot/perl: 523f125d4a71aa467fc6a9acfe6c304944f5a5f5
p4raw-link: @33557 on //depot/perl: 502d9230ec570254fed51ae721c1da50944a5cbf
p4raw-link: @33556 on //depot/perl: d3153aa44fba6434baddd69db421016fa7e77089
p4raw-link: @33554 on //depot/perl: 7027b9a31bf80c5639c73f75155ed1a89c674c30
p4raw-link: @33553 on //depot/perl: f175cff5cac5f8199b897ce2f1c73312d99d5761

p4raw-id: //depot/maint-5.10/perl@33945
p4raw-branched: from //depot/perl@33944 'branch in' lib/parent.pm
	lib/parent/t/compile-time-file.t lib/parent/t/compile-time.t
	lib/parent/t/lib/Dummy.pm lib/parent/t/lib/Dummy/Outside.pm
	lib/parent/t/lib/Dummy2.plugin
	lib/parent/t/lib/FileThatOnlyExistsAsPMC.pmc
	lib/parent/t/lib/ReturnsFalse.pm
	lib/parent/t/parent-classfromclassfile.t
	lib/parent/t/parent-classfromfile.t lib/parent/t/parent-pmc.t
	lib/parent/t/parent-returns-false.t lib/parent/t/parent.t
p4raw-integrated: from //depot/perl@33944 'copy in'
	ext/IO/lib/IO/Socket/INET.pm (@27609..) t/op/reg_namedcapture.t
	(@31453..) lib/base.pm (@32005..) t/op/switch.t (@33434..)
	mad/t/p55.t (@33467..) 'merge in' pod/perlintern.pod (@33289..)
p4raw-integrated: from //depot/perl@33608 'copy in' regen_lib.pl
	(@33539..) 'merge in' regen.pl (@33537..) Makefile.SH
	(@33542..)
p4raw-integrated: from //depot/perl@33584 'ignore' dump.c (@33364..)
p4raw-integrated: from //depot/perl@33557 'edit in' pp.c (@33304..)
	'merge in' t/lib/warnings/9uninit (@33544..)
p4raw-integrated: from //depot/perl@33556 'merge in'
	Porting/Maintainers.pl (@33499..) MANIFEST (@33505..)
p4raw-integrated: from //depot/perl@33553 'merge in' mg.c (@33458..)

1 files changed, 3 insertions, 1 deletions

diff --git a/pp.c b/pp.c
index 619dca11f5..59a911be9b 100644
--- a/pp.c
+++ b/pp.c
@@ -3172,6 +3172,8 @@ PP(pp_substr)
 		repl = SvPV_const(repl_sv_copy, repl_len);
 		repl_is_utf8 = DO_UTF8(repl_sv_copy) && SvCUR(sv);
 	    }
+	    if (!SvOK(sv))
+		sv_setpvs(sv, "");
 	    sv_insert(sv, pos, rem, repl, repl_len);
 	    if (repl_is_utf8)
 		SvUTF8_on(sv);
@@ -3191,7 +3193,7 @@ PP(pp_substr)
 		else if (SvOK(sv))	/* is it defined ? */
 		    (void)SvPOK_only_UTF8(sv);
 		else
-		    sv_setpvn(sv,"",0);	/* avoid lexical reincarnation */
+		    sv_setpvs(sv, ""); /* avoid lexical reincarnation */
 	    }
 
 	    if (SvTYPE(TARG) < SVt_PVLV) {