fix bugs in processing %v-*d and similar format specs (from

Avi Finkel <avi@finkel.org>)

p4raw-id: //depot/perl@6385

1 files changed, 17 insertions, 11 deletions

diff --git a/sv.c b/sv.c
index 6ee91be32f..5f5d2819e4 100644
--- a/sv.c
+++ b/sv.c
@@ -5963,17 +5963,6 @@ Perl_sv_vcatpvfn(pTHX_ SV *sv, const char *pat, STRLEN patlen, va_list *args, SV
 	    case 'v':
 		vectorize = TRUE;
 		q++;
-		if (args)
-		    vecsv = va_arg(*args, SV*);
-		else if (svix < svmax)
-		    vecsv = svargs[svix++];
-		else {
-		    vecstr = (U8*)"";
-		    veclen = 0;
-		    continue;
-		}
-		vecstr = (U8*)SvPVx(vecsv,veclen);
-		utf = DO_UTF8(vecsv);
 		continue;
 
 	    default:
@@ -6024,6 +6013,23 @@ Perl_sv_vcatpvfn(pTHX_ SV *sv, const char *pat, STRLEN patlen, va_list *args, SV
 	    has_precis = TRUE;
 	}
 
+	if (vectorize) {
+	    if (args) {
+		vecsv = va_arg(*args, SV*);
+		vecstr = (U8*)SvPVx(vecsv,veclen);
+		utf = DO_UTF8(vecsv);
+	    }
+	    else if (svix < svmax) {
+		vecsv = svargs[svix++];
+		vecstr = (U8*)SvPVx(vecsv,veclen);
+		utf = DO_UTF8(vecsv);
+	    }
+	    else {
+		vecstr = (U8*)"";
+		veclen = 0;
+	    }
+	}
+
 	/* SIZE */
 
 	switch (*q) {