X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=pp.c;h=b6275ddd478b27bf22e6570f024240d78192cfe4;hb=68435ea717a7cd7f41241ff44917b542abd94222;hp=45654a944557e83166fb2d69dc55a302f541fadd;hpb=7e2040f0b7c6fc88ec07b6e169aa2f75fc0130a4;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/pp.c b/pp.c
index 45654a9..b6275dd 100644
--- a/pp.c
+++ b/pp.c
@@ -1,6 +1,6 @@
 /*    pp.c
  *
- *    Copyright (c) 1991-1999, Larry Wall
+ *    Copyright (c) 1991-2000, Larry Wall
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -585,8 +585,8 @@ PP(pp_bless)
 	SV *ssv = POPs;
 	STRLEN len;
 	char *ptr = SvPV(ssv,len);
-	if (ckWARN(WARN_UNSAFE) && len == 0)
-	    Perl_warner(aTHX_ WARN_UNSAFE, 
+	if (ckWARN(WARN_MISC) && len == 0)
+	    Perl_warner(aTHX_ WARN_MISC, 
 		   "Explicit blessing to '' (assuming package main)");
 	stash = gv_stashpvn(ptr, len, TRUE);
     }
@@ -832,8 +832,8 @@ PP(pp_undef)
 	hv_undef((HV*)sv);
 	break;
     case SVt_PVCV:
-	if (ckWARN(WARN_UNSAFE) && cv_const_sv((CV*)sv))
-	    Perl_warner(aTHX_ WARN_UNSAFE, "Constant subroutine %s undefined",
+	if (ckWARN(WARN_MISC) && cv_const_sv((CV*)sv))
+	    Perl_warner(aTHX_ WARN_MISC, "Constant subroutine %s undefined",
 		 CvANON((CV*)sv) ? "(anonymous)" : GvENAME(CvGV((CV*)sv)));
 	/* FALL THROUGH */
     case SVt_PVFM:
@@ -2012,7 +2012,9 @@ PP(pp_substr)
 	rem -= pos;
     }
     if (fail < 0) {
-	if (ckWARN(WARN_SUBSTR) || lvalue || repl)
+	if (lvalue || repl)
+	    Perl_croak(aTHX_ "substr outside of string");
+	if (ckWARN(WARN_SUBSTR))
 	    Perl_warner(aTHX_ WARN_SUBSTR, "substr outside of string");
 	RETPUSHUNDEF;
     }
@@ -2199,17 +2201,16 @@ PP(pp_chr)
     char *tmps;
     U32 value = POPu;
 
-    SvUTF8_off(TARG);				/* decontaminate */
     (void)SvUPGRADE(TARG,SVt_PV);
 
-    if (value >= 128 && !IN_BYTE) {
-	SvGROW(TARG,8);
+    if (value > 255 && !IN_BYTE) {
+	SvGROW(TARG, UTF8_MAXLEN+1);
 	tmps = SvPVX(TARG);
 	tmps = (char*)uv_to_utf8((U8*)tmps, (UV)value);
 	SvCUR_set(TARG, tmps - SvPVX(TARG));
 	*tmps = '\0';
-	SvUTF8_on(TARG);
 	(void)SvPOK_only(TARG);
+	SvUTF8_on(TARG);
 	XPUSHs(TARG);
 	RETURN;
     }
@@ -2219,6 +2220,7 @@ PP(pp_chr)
     tmps = SvPVX(TARG);
     *tmps++ = value;
     *tmps = '\0';
+    SvUTF8_off(TARG);				/* decontaminate */
     (void)SvPOK_only(TARG);
     XPUSHs(TARG);
     RETURN;
@@ -2881,8 +2883,8 @@ PP(pp_anonhash)
 	SV *val = NEWSV(46, 0);
 	if (MARK < SP)
 	    sv_setsv(val, *++MARK);
-	else if (ckWARN(WARN_UNSAFE))
-	    Perl_warner(aTHX_ WARN_UNSAFE, "Odd number of elements in hash assignment");
+	else if (ckWARN(WARN_MISC))
+	    Perl_warner(aTHX_ WARN_MISC, "Odd number of elements in hash assignment");
 	(void)hv_store_ent(hv,key,val,0);
     }
     SP = ORIGMARK;
@@ -3392,8 +3394,8 @@ PP(pp_unpack)
 	default:
 	    DIE(aTHX_ "Invalid type in unpack: '%c'", (int)datumtype);
 	case ',': /* grandfather in commas but with a warning */
-	    if (commas++ == 0 && ckWARN(WARN_UNSAFE))
-		Perl_warner(aTHX_ WARN_UNSAFE,
+	    if (commas++ == 0 && ckWARN(WARN_UNPACK))
+		Perl_warner(aTHX_ WARN_UNPACK,
 			    "Invalid type in unpack: '%c'", (int)datumtype);
 	    break;
 	case '%':
@@ -4455,8 +4457,8 @@ PP(pp_pack)
 	default:
 	    DIE(aTHX_ "Invalid type in pack: '%c'", (int)datumtype);
 	case ',': /* grandfather in commas but with a warning */
-	    if (commas++ == 0 && ckWARN(WARN_UNSAFE))
-		Perl_warner(aTHX_ WARN_UNSAFE,
+	    if (commas++ == 0 && ckWARN(WARN_PACK))
+		Perl_warner(aTHX_ WARN_PACK,
 			    "Invalid type in pack: '%c'", (int)datumtype);
 	    break;
 	case '%':
@@ -4908,11 +4910,11 @@ PP(pp_pack)
 		     * of pack() (and all copies of the result) are
 		     * gone.
 		     */
-		    if (ckWARN(WARN_UNSAFE) && (SvTEMP(fromstr)
+		    if (ckWARN(WARN_PACK) && (SvTEMP(fromstr)
 						|| (SvPADTMP(fromstr)
 						    && !SvREADONLY(fromstr))))
 		    {
-			Perl_warner(aTHX_ WARN_UNSAFE,
+			Perl_warner(aTHX_ WARN_PACK,
 				"Attempt to pack pointer to temporary value");
 		    }
 		    if (SvPOK(fromstr) || SvNIOK(fromstr))