X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=pp.c;h=7a2769fc7ce5ec64b7ce806bfc5f80d2fa63d43b;hb=ffebc68c76e0689738334ed887c5b93d5d71a5f3;hp=51facc0730a02f733fe8387c13d961712eeeabc2;hpb=3e6618b7a3a573729d121d2ba204ea2164d47107;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/pp.c b/pp.c
index 51facc0..7a2769f 100644
--- a/pp.c
+++ b/pp.c
@@ -555,7 +555,7 @@ PP(pp_gelem)
     case 'F':
 	if (strEQ(elem, "FILEHANDLE")) {
 	    /* finally deprecated in 5.8.0 */
-	    deprecate("*glob{FILEHANDLE}");
+	    deprecate_old("*glob{FILEHANDLE}");
 	    tmpRef = (SV*)GvIOp(gv);
 	}
 	else
@@ -3147,9 +3147,9 @@ PP(pp_ord)
     U8 *s = (U8*)SvPVx(argsv, len);
     SV *tmpsv;
 
-    if (PL_encoding && !DO_UTF8(argsv)) {
+    if (PL_encoding && SvPOK(argsv) && !DO_UTF8(argsv)) {
         tmpsv = sv_2mortal(newSVsv(argsv));
-        s = (U8*)Perl_sv_recode_to_utf8(aTHX_ tmpsv, PL_encoding);
+        s = (U8*)sv_recode_to_utf8(tmpsv, PL_encoding);
         argsv = tmpsv;
     }
 
@@ -3184,7 +3184,7 @@ PP(pp_chr)
     *tmps = '\0';
     (void)SvPOK_only(TARG);
     if (PL_encoding)
-        Perl_sv_recode_to_utf8(aTHX_ TARG, PL_encoding);
+        sv_recode_to_utf8(TARG, PL_encoding);
     XPUSHs(TARG);
     RETURN;
 }
@@ -3350,8 +3350,10 @@ PP(pp_uc)
 	    SETs(TARG);
 	}
 	else {
+	    STRLEN nchar = utf8_length(s, s + len);
+
 	    (void)SvUPGRADE(TARG, SVt_PV);
-	    SvGROW(TARG, (len * 2) + 1);
+	    SvGROW(TARG, (nchar * UTF8_MAXLEN_UCLC) + 1);
 	    (void)SvPOK_only(TARG);
 	    d = (U8*)SvPVX(TARG);
 	    send = s + len;
@@ -3417,8 +3419,10 @@ PP(pp_lc)
 	    SETs(TARG);
 	}
 	else {
+	    STRLEN nchar = utf8_length(s, s + len);
+
 	    (void)SvUPGRADE(TARG, SVt_PV);
-	    SvGROW(TARG, (len * 2) + 1);
+	    SvGROW(TARG, (nchar * UTF8_MAXLEN_UCLC) + 1);
 	    (void)SvPOK_only(TARG);
 	    d = (U8*)SvPVX(TARG);
 	    send = s + len;
@@ -3922,8 +3926,11 @@ PP(pp_splice)
 	offset = 0;
 	length = AvMAX(ary) + 1;
     }
-    if (offset > AvFILLp(ary) + 1)
+    if (offset > AvFILLp(ary) + 1) {
+	if (ckWARN(WARN_MISC))
+	    Perl_warner(aTHX_ WARN_MISC, "splice() offset past end of array" );
 	offset = AvFILLp(ary) + 1;
+    }
     after = AvFILLp(ary) + 1 - (offset + length);
     if (after < 0) {				/* not that much array */
 	length += after;			/* offset+length now in array */