X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=op.c;h=a3dee91b333de62ba8ea791c0f4d5b35f324d7be;hb=06c0cc96ebd866767a6d107ed78967600f7e0395;hp=02c1fe846d750e73607741410c6aa35147d90411;hpb=dcda55fce16d4bfd5fd692594c1b771b8c7e87d8;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/op.c b/op.c
index 02c1fe8..a3dee91 100644
--- a/op.c
+++ b/op.c
@@ -211,11 +211,13 @@ Perl_allocmy(pTHX_ char *name)
     PADOFFSET off;
 
     /* complain about "my $<special_var>" etc etc */
-    if (!(PL_in_my == KEY_our ||
+    if (*name &&
+	!(PL_in_my == KEY_our ||
 	  isALPHA(name[1]) ||
 	  (USE_UTF8_IN_NAMES && UTF8_IS_START(name[1])) ||
-	  (name[1] == '_' && (*name == '$' || (int)strlen(name) > 2))))
+	  (name[1] == '_' && (*name == '$' || name[2]))))
     {
+	/* name[2] is true if strlen(name) > 2  */
 	if (!isPRINT(name[1]) || strchr("\t\n\r\f", name[1])) {
 	    /* 1999-02-27 mjd@plover.com */
 	    char *p;
@@ -4345,9 +4347,6 @@ Perl_newATTRSUB(pTHX_ I32 floor, OP *o, OP *proto, OP *attrs, OP *block)
 		SAVEFREESV(PL_compcv);
 		goto done;
 	    }
-	    /* ahem, death to those who redefine active sort subs */
-	    if (PL_curstackinfo->si_type == PERLSI_SORT && PL_sortcop == CvSTART(cv))
-		Perl_croak(aTHX_ "Can't redefine active sort subroutine %s", name);
 	    if (block) {
 		if (ckWARN(WARN_REDEFINE)
 		    || (CvCONST(cv)
@@ -4539,8 +4538,10 @@ Perl_newATTRSUB(pTHX_ I32 floor, OP *o, OP *proto, OP *attrs, OP *block)
 	    goto done;
 
 	if (strEQ(s, "BEGIN") && !PL_error_count) {
+	    dSP;
 	    const I32 oldscope = PL_scopestack_ix;
 	    ENTER;
+	    PUSHSTACKi(PERLSI_REQUIRE);
 	    SAVECOPFILE(&PL_compiling);
 	    SAVECOPLINE(&PL_compiling);
 
@@ -4553,6 +4554,7 @@ Perl_newATTRSUB(pTHX_ I32 floor, OP *o, OP *proto, OP *attrs, OP *block)
 
 	    PL_curcop = &PL_compiling;
 	    PL_compiling.op_private = (U8)(PL_hints & HINT_PRIVATE_MASK);
+	    POPSTACK;
 	    LEAVE;
 	}
 	else if (strEQ(s, "END") && !PL_error_count) {
@@ -5943,8 +5945,9 @@ Perl_ck_require(pTHX_ OP *o)
 
 	    for (s = SvPVX(sv); *s; s++) {
 		if (*s == ':' && s[1] == ':') {
+		    const STRLEN len = strlen(s+2)+1;
 		    *s = '/';
-		    Move(s+2, s+1, strlen(s+2)+1, char);
+		    Move(s+2, s+1, len, char);
 		    SvCUR_set(sv, SvCUR(sv) - 1);
 		}
 	    }