X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=sv.c;h=076ea5c8962c1bdf794a9d7c0ea1dc12aa0174e7;hb=e934609f7db1163b003ba7314f8d52ebfc1e2f12;hp=f3d39ce722c9dcf2ef9abdc452ad66ee4a0a956e;hpb=b47cad0843cec3c59de073dc0b722c525c4e1720;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/sv.c b/sv.c
index f3d39ce..076ea5c 100644
--- a/sv.c
+++ b/sv.c
@@ -3194,7 +3194,7 @@ Perl_sv_copypv(pTHX_ SV *dsv, register SV *ssv)
 {
     SV *tmpsv;
 
-    if ( SvTHINKFIRST(ssv) && SvROK(ssv) && SvAMAGIC(ssv) && 
+    if ( SvTHINKFIRST(ssv) && SvROK(ssv) && SvAMAGIC(ssv) &&
 	 (tmpsv = AMG_CALLun(ssv,string))) {
 	if (SvTYPE(tmpsv) != SVt_RV || (SvRV(tmpsv) != SvRV(ssv))) {
 	    SvSetSV(dsv,tmpsv);
@@ -5313,9 +5313,11 @@ Perl_sv_pos_b2u(pTHX_ register SV *sv, I32* offsetp)
     send = s + *offsetp;
     len = 0;
     while (s < send) {
-	STRLEN n;
-	/* Call utf8n_to_uvchr() to validate the sequence */
-	utf8n_to_uvchr(s, UTF8SKIP(s), &n, 0);
+	STRLEN n = 1;
+	/* Call utf8n_to_uvchr() to validate the sequence
+	 * (unless a simple non-UTF character) */
+	if (!UTF8_IS_INVARIANT(*s))
+	    utf8n_to_uvchr(s, UTF8SKIP(s), &n, 0);
 	if (n > 0) {
 	    s += n;
 	    len++;
@@ -5882,13 +5884,15 @@ screamer2:
 	    /* Accomodate broken VAXC compiler, which applies U8 cast to
 	     * both args of ?: operator, causing EOF to change into 255
 	     */
-	    if (cnt) { i = (U8)buf[cnt - 1]; } else { i = EOF; }
+	    if (cnt > 0) { i = (U8)buf[cnt - 1]; } else { i = EOF; }
 	}
 
-	if (append)
-	    sv_catpvn(sv, (char *) buf, cnt);
-	else
-	    sv_setpvn(sv, (char *) buf, cnt);
+	if (cnt > 0) {
+	    if (append)
+		sv_catpvn(sv, (char *) buf, cnt);
+	    else
+		sv_setpvn(sv, (char *) buf, cnt);
+	}
 
 	if (i != EOF &&			/* joy */
 	    (!rslen ||
@@ -10512,7 +10516,7 @@ The PV of the sv is returned.
 char *
 Perl_sv_recode_to_utf8(pTHX_ SV *sv, SV *encoding)
 {
-     if (SvPOK(sv) && !DO_UTF8(sv) && SvROK(encoding)) {
+    if (SvPOK(sv) && !DO_UTF8(sv) && SvROK(encoding)) {
 	  SV *uni;
 	  STRLEN len;
 	  char *s;
@@ -10523,7 +10527,16 @@ Perl_sv_recode_to_utf8(pTHX_ SV *sv, SV *encoding)
 	  EXTEND(SP, 3);
 	  XPUSHs(encoding);
 	  XPUSHs(sv);
+/* 
+  NI-S 2002/07/09
+  Passing sv_yes is wrong - it needs to be or'ed set of constants
+  for Encode::XS, while UTf-8 decode (currently) assumes a true value means 
+  remove converted chars from source.
+
+  Both will default the value - let them.
+  
 	  XPUSHs(&PL_sv_yes);
+*/
 	  PUTBACK;
 	  call_method("decode", G_SCALAR);
 	  SPAGAIN;
@@ -10539,8 +10552,9 @@ Perl_sv_recode_to_utf8(pTHX_ SV *sv, SV *encoding)
 	  FREETMPS;
 	  LEAVE;
 	  SvUTF8_on(sv);
-     }
-     return SvPVX(sv);
+    }
+    return SvPVX(sv);
 }
 
 
+