Re: [perl #39126] possible memory related bug when using sprintf with an utf-8 encoded format-string and iso-8859-1 encoded string variables.

Message-Id: <20060521193259.81E5.BQW10602@nifty.com>

with test tweaks further suggested by the same

p4raw-id: //depot/perl@28328

1 files changed, 19 insertions, 17 deletions

diff --git a/sv.c b/sv.c
index d6e307d583..3653b86652 100644
--- a/sv.c
+++ b/sv.c
@@ -9338,27 +9338,29 @@ Perl_sv_vcatpvfn(pTHX_ SV *sv, const char *pat, STRLEN patlen, va_list *args, SV
 	    continue;	/* not "break" */
 	}
 
-	/* calculate width before utf8_upgrade changes it */
+	if (is_utf8 != has_utf8) {
+	    if (is_utf8) {
+		if (SvCUR(sv))
+		    sv_utf8_upgrade(sv);
+	    }
+	    else {
+		const STRLEN old_elen = elen;
+		SV * const nsv = sv_2mortal(newSVpvn(eptr, elen));
+		sv_utf8_upgrade(nsv);
+		eptr = SvPVX_const(nsv);
+		elen = SvCUR(nsv);
+
+		if (width) { /* fudge width (can't fudge elen) */
+		    width += elen - old_elen;
+		}
+		is_utf8 = TRUE;
+	    }
+	}
+
 	have = esignlen + zeros + elen;
 	if (have < zeros)
 	    Perl_croak_nocontext(PL_memory_wrap);
 
-	if (is_utf8 != has_utf8) {
-	     if (is_utf8) {
-		  if (SvCUR(sv))
-		       sv_utf8_upgrade(sv);
-	     }
-	     else {
-		  SV * const nsv = sv_2mortal(newSVpvn(eptr, elen));
-		  sv_utf8_upgrade(nsv);
-		  eptr = SvPVX_const(nsv);
-		  elen = SvCUR(nsv);
-	     }
-	     SvGROW(sv, SvCUR(sv) + elen + 1);
-	     p = SvEND(sv);
-	     *p = '\0';
-	}
-
 	need = (have > width ? have : width);
 	gap = need - have;