X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=sv.c;h=fe7c0d46070e8dc588b4c2b121d4156f8822c8cc;hb=02a834a9ae508dc3fab0b5a0375804172985b012;hp=dd44025ddbf4276dc370d539031bb36065f25c48;hpb=be75b15786815a6156474834bcf03091919a84b9;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/sv.c b/sv.c
index dd44025..fe7c0d4 100644
--- a/sv.c
+++ b/sv.c
@@ -5884,16 +5884,19 @@ screamer2:
 	    /* Accomodate broken VAXC compiler, which applies U8 cast to
 	     * both args of ?: operator, causing EOF to change into 255
 	     */
-	    if (cnt > 0) { i = (U8)buf[cnt - 1]; } else { i = EOF; }
-	}
-
-	if (cnt > 0) {
-	    if (append)
-		sv_catpvn(sv, (char *) buf, cnt);
+	    if (cnt > 0)
+		 i = (U8)buf[cnt - 1];
 	    else
-		sv_setpvn(sv, (char *) buf, cnt);
+		 i = EOF;
 	}
 
+	if (cnt < 0)
+	    cnt = 0;  /* we do need to re-set the sv even when cnt <= 0 */
+	if (append)
+	     sv_catpvn(sv, (char *) buf, cnt);
+	else
+	     sv_setpvn(sv, (char *) buf, cnt);
+
 	if (i != EOF &&			/* joy */
 	    (!rslen ||
 	     SvCUR(sv) < rslen ||
@@ -7734,7 +7737,7 @@ Perl_sv_vcatpvfn(pTHX_ SV *sv, const char *pat, STRLEN patlen, va_list *args, SV
         /* large enough for "%#.#f" --chip */
 	/* what about long double NVs? --jhi */
 
-	SV *vecsv;
+	SV *vecsv = Nullsv;
 	U8 *vecstr = Null(U8*);
 	STRLEN veclen = 0;
 	char c = 0;
@@ -7774,7 +7777,7 @@ Perl_sv_vcatpvfn(pTHX_ SV *sv, const char *pat, STRLEN patlen, va_list *args, SV
     We allow format specification elements in this order:
 	\d+\$              explicit format parameter index
 	[-+ 0#]+           flags
-	\*?(\d+\$)?v       vector with optional (optionally specified) arg
+	v|\*(\d+\$)?v      vector with optional (optionally specified) arg
 	\d+|\*(\d+\$)?     width using optional (optionally specified) arg
 	\.(\d*|\*(\d+\$)?) precision using optional (optionally specified) arg
 	[hlqLV]            size
@@ -7886,7 +7889,10 @@ Perl_sv_vcatpvfn(pTHX_ SV *sv, const char *pat, STRLEN patlen, va_list *args, SV
 	    q++;
 	    if (*q == '*') {
 		q++;
-		if (EXPECT_NUMBER(q, epix) && *q++ != '$') /* epix currently unused */
+		if (EXPECT_NUMBER(q, epix) && *q++ != '$')
+		    goto unknown;
+		/* XXX: todo, support specified precision parameter */
+		if (epix)
 		    goto unknown;
 		if (args)
 		    i = va_arg(*args, int);
@@ -10154,6 +10160,11 @@ perl_clone_using(PerlInterpreter *proto_perl, UV flags,
     Copy(proto_perl->Inexttype, PL_nexttype, 5,	I32);
     PL_nexttoke		= proto_perl->Inexttoke;
 
+    /* XXX This is probably masking the deeper issue of why
+     * SvANY(proto_perl->Ilinestr) can be NULL at this point. For test case:
+     * http://archive.develooper.com/perl5-porters%40perl.org/msg83298.html
+     * (A little debugging with a watchpoint on it may help.)
+     */
     if (SvANY(proto_perl->Ilinestr)) {
 	PL_linestr		= sv_dup_inc(proto_perl->Ilinestr, param);
 	i = proto_perl->Ibufptr - SvPVX(proto_perl->Ilinestr);
@@ -10192,6 +10203,7 @@ perl_clone_using(PerlInterpreter *proto_perl, UV flags,
     PL_padix_floor		= proto_perl->Ipadix_floor;
     PL_pad_reset_pending	= proto_perl->Ipad_reset_pending;
 
+    /* XXX See comment on SvANY(proto_perl->Ilinestr) above */
     if (SvANY(proto_perl->Ilinestr)) {
 	i = proto_perl->Ilast_uni - SvPVX(proto_perl->Ilinestr);
 	PL_last_uni		= SvPVX(PL_linestr) + (i < 0 ? 0 : i);