Another Unicode s/// buglet, from SADAHIRO Tomoyuki.

p4raw-id: //depot/perl@17358

1 files changed, 9 insertions, 0 deletions

diff --git a/pp_hot.c b/pp_hot.c
index 22c54fcfde..526468df81 100644
--- a/pp_hot.c
+++ b/pp_hot.c
@@ -1985,6 +1985,15 @@ PP(pp_subst)
     if (dstr) {
         c = SvPV(dstr, clen);
 	doutf8 = DO_UTF8(dstr);
+	/* replacement needing upgrading? */
+	if (DO_UTF8(TARG) && !doutf8) {
+	     SV *nsv = newSVpvn(c, clen);
+	     if (PL_encoding)
+		  sv_recode_to_utf8(nsv, PL_encoding);
+	     else
+		  sv_utf8_upgrade(nsv);
+	     c = SvPV(nsv, clen);
+	}
     }
     else {
         c = Nullch;