STATIC U32 vmg_svt_len(pTHX_ SV *sv, MAGIC *mg) {
SV *svr;
- I32 len;
+ I32 len, has_array;
U32 ret;
dSP;
int count;
+ has_array = SvTYPE(sv) == SVt_PVAV;
+
ENTER;
SAVETMPS;
EXTEND(SP, 3);
PUSHs(sv_2mortal(newRV_inc(sv)));
PUSHs(mg->mg_obj ? mg->mg_obj : &PL_sv_undef);
- if (SvTYPE(sv) == SVt_PVAV) {
+ if (has_array) {
len = av_len((AV *) sv) + 1;
mPUSHi(len);
} else {
- len = 1;
+ len = 0;
PUSHs(&PL_sv_undef);
}
PUTBACK;
FREETMPS;
LEAVE;
- return ret - 1;
+ return has_array ? ret - 1 : ret;
}
STATIC int vmg_svt_clear(pTHX_ SV *sv, MAGIC *mg) {