av = (AV*)SvRV(sv);
if (SvTYPE(av) != SVt_PVAV)
DIE("Not an ARRAY reference");
- if (op->op_private & OPpLVAL_INTRO)
- av = (AV*)save_svref((SV**)sv);
if (op->op_flags & OPf_REF) {
PUSHs((SV*)av);
RETURN;
hv = (HV*)SvRV(sv);
if (SvTYPE(hv) != SVt_PVHV)
DIE("Not a HASH reference");
- if (op->op_private & OPpLVAL_INTRO)
- hv = (HV*)save_svref((SV**)sv);
if (op->op_flags & OPf_REF) {
SETs((SV*)hv);
RETURN;
}
else {
dTARGET;
- if (HvFILL(hv)) {
- sprintf(buf, "%ld/%ld", (long)HvFILL(hv), (long)HvMAX(hv)+1);
- sv_setpv(TARG, buf);
- }
+ if (HvFILL(hv))
+ sv_setpvf(TARG, "%ld/%ld",
+ (long)HvFILL(hv), (long)HvMAX(hv) + 1);
else
sv_setiv(TARG, 0);
SETTARG;
if (op->op_private & OPpASSIGN_COMMON) {
for (relem = firstrelem; relem <= lastrelem; relem++) {
/*SUPPRESS 560*/
- if (sv = *relem)
+ if (sv = *relem) {
+ TAINT_NOT; /* Each item is independent */
*relem = sv_mortalcopy(sv);
+ }
}
}
av_extend(ary, lastrelem - relem);
i = 0;
while (relem <= lastrelem) { /* gobble up all the rest */
+ SV **didstore;
sv = NEWSV(28,0);
assert(*relem);
sv_setsv(sv,*relem);
*(relem++) = sv;
- (void)av_store(ary,i++,sv);
- if (magic)
+ didstore = av_store(ary,i++,sv);
+ if (magic) {
mg_set(sv);
+ if (!didstore)
+ SvREFCNT_dec(sv);
+ }
TAINT_NOT;
}
break;
while (relem < lastrelem) { /* gobble up all the rest */
STRLEN len;
+ HE *didstore;
if (*relem)
sv = *(relem++);
else
if (*relem)
sv_setsv(tmpstr,*relem); /* value */
*(relem++) = tmpstr;
- (void)hv_store_ent(hash,sv,tmpstr,0);
- if (magic)
+ didstore = hv_store_ent(hash,sv,tmpstr,0);
+ if (magic) {
mg_set(tmpstr);
+ if (!didstore)
+ SvREFCNT_dec(tmpstr);
+ }
TAINT_NOT;
}
if (relem == lastrelem)
++BmUSEFUL(pm->op_pmshort);
ret_no:
+ if (global && !(pm->op_pmflags & PMf_CONTINUE)) {
+ if (SvTYPE(TARG) >= SVt_PVMG && SvMAGIC(TARG)) {
+ MAGIC* mg = mg_find(TARG, 'g');
+ if (mg)
+ mg->mg_len = -1;
+ }
+ }
LEAVE_SCOPE(oldsave);
if (gimme == G_ARRAY)
RETURN;
gimme = G_SCALAR;
}
+ TAINT_NOT;
if (gimme == G_VOID)
SP = newsp;
else if (gimme == G_SCALAR) {
SP = MARK;
}
else if (gimme == G_ARRAY) {
- for (mark = newsp + 1; mark <= SP; mark++)
- if (!(SvFLAGS(*mark) & (SVs_PADTMP|SVs_TEMP)))
+ /* in case LEAVE wipes old return values */
+ for (mark = newsp + 1; mark <= SP; mark++) {
+ if (!(SvFLAGS(*mark) & (SVs_PADTMP|SVs_TEMP))) {
*mark = sv_mortalcopy(*mark);
- /* in case LEAVE wipes old return values */
+ TAINT_NOT; /* Each item is independent */
+ }
+ }
}
curpm = newpm; /* Don't pop $1 et al till now */
POPBLOCK(cx,newpm);
POPSUB1(cx); /* Delay POPSUB2 until stack values are safe */
+ TAINT_NOT;
if (gimme == G_SCALAR) {
MARK = newsp + 1;
if (MARK <= SP)
}
else if (gimme == G_ARRAY) {
for (MARK = newsp + 1; MARK <= SP; MARK++) {
- if (!SvTEMP(*MARK))
+ if (!SvTEMP(*MARK)) {
*MARK = sv_mortalcopy(*MARK);
+ TAINT_NOT; /* Each item is independent */
+ }
}
}
PUTBACK;
dSP;
SV* sv;
SV* ob;
- HV* stash;
GV* gv;
+ HV* stash;
+ char* name;
char* packname;
STRLEN packlen;
- char* name;
- char* origname;
- char* sep;
- char* p;
+ name = SvPV(TOPs, na);
sv = *(stack_base + TOPMARK + 1);
-
- sep = name = origname = SvPV(TOPs, na);
- for (p = name; *p; p++) {
- if (*p == '\'')
- sep = p, name = p + 1;
- else if (*p == ':' && *(p + 1) == ':')
- sep = p, name = p + 2;
- }
- if (name == origname)
- packname = Nullch;
- else {
- packname = origname;
- packlen = sep - origname;
-
- /* let gv_fetchmethod() handle SUPER:: */
- if (packlen == 5 && strnEQ(packname, "SUPER", 5)) {
- packname = Nullch;
- name = origname;
- }
- }
-
+
if (SvGMAGICAL(sv))
mg_get(sv);
if (SvROK(sv))
ob = (SV*)SvRV(sv);
else {
- char* tname = Nullch;
- STRLEN tlen = 0;
GV* iogv;
+ packname = Nullch;
if (!SvOK(sv) ||
- !(tname = SvPV(sv, tlen)) ||
- !(iogv = gv_fetchpv(tname, FALSE, SVt_PVIO)) ||
- !(ob = (SV*)GvIO(iogv)))
+ !(packname = SvPV(sv, packlen)) ||
+ !(iogv = gv_fetchpv(packname, FALSE, SVt_PVIO)) ||
+ !(ob=(SV*)GvIO(iogv)))
{
- if (!packname) {
- packname = tname;
- packlen = tlen;
- }
- if (!packname || !isALPHA(*packname))
+ if (!packname || !isIDFIRST(*packname))
DIE("Can't call method \"%s\" without a package or object reference", name);
+ stash = gv_stashpvn(packname, packlen, TRUE);
goto fetch;
}
-
- /* working on an IO object */
*(stack_base + TOPMARK + 1) = sv_2mortal(newRV((SV*)iogv));
}
if (!ob || !SvOBJECT(ob))
- DIE("Can't call method \"%s\" on unblessed reference", origname);
+ DIE("Can't call method \"%s\" on unblessed reference", name);
+
+ stash = SvSTASH(ob);
- if (!packname)
- stash = SvSTASH(ob);
- else {
fetch:
- stash = gv_stashpvn(packname, packlen, TRUE);
- }
gv = gv_fetchmethod(stash, name);
- if (!gv)
- DIE("Can't locate object method \"%s\" via package \"%s\"",
- name, HvNAME((strnEQ(name, "SUPER", 5) &&
- (name[5] == '\'' ||
- (name[5] == ':' && name[6] == ':')))
- ? curcop->cop_stash : stash));
+ if (!gv) {
+ char* leaf = name;
+ char* sep = Nullch;
+ char* p;
+
+ for (p = name; *p; p++) {
+ if (*p == '\'')
+ sep = p, leaf = p + 1;
+ else if (*p == ':' && *(p + 1) == ':')
+ sep = p, leaf = p + 2;
+ }
+ if (!sep || ((sep - name) == 5 && strnEQ(name, "SUPER", 5))) {
+ packname = HvNAME(sep ? curcop->cop_stash : stash);
+ packlen = strlen(packname);
+ }
+ else {
+ packname = name;
+ packlen = sep - name;
+ }
+ DIE("Can't locate object method \"%s\" via package \"%.*s\"",
+ leaf, (int)packlen, packname);
+ }
SETs(isGV(gv) ? (SV*)GvCV(gv) : (SV*)gv);
RETURN;
}
-
projects / p5sagit/p5-mst-13.2.git / blobdiff