X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=av.c;h=cad6eaeac49d68c63b1dc44215947ece1c73c898;hb=9c3bb3dec7e8cf606ffb42be143f70853f7d31a1;hp=dfd25df76064ef9785f31fb38438b55c6da070be;hpb=7d55f6220f027190d816af438b0283662ab1736e;p=p5sagit%2Fp5-mst-13.2.git diff --git a/av.c b/av.c index dfd25df..cad6eae 100644 --- a/av.c +++ b/av.c @@ -153,12 +153,19 @@ I32 lval; return av_store(av,key,sv); } if (AvARRAY(av)[key] == &sv_undef) { + emptyness: if (lval) { sv = NEWSV(6,0); return av_store(av,key,sv); } return 0; } + else if (AvREIFY(av) + && (!AvARRAY(av)[key] /* eg. @_ could have freed elts */ + || SvTYPE(AvARRAY(av)[key]) == SVTYPEMASK)) { + AvARRAY(av)[key] = &sv_undef; /* 1/2 reify */ + goto emptyness; + } return &AvARRAY(av)[key]; } @@ -327,10 +334,6 @@ register AV *av; while (key) SvREFCNT_dec(AvARRAY(av)[--key]); } - if (key = AvARRAY(av) - AvALLOC(av)) { - AvMAX(av) += key; - SvPVX(av) = (char*)AvALLOC(av); - } Safefree(AvALLOC(av)); AvALLOC(av) = 0; SvPVX(av) = 0;