From: Vincent Pit Date: Wed, 15 Oct 2008 15:50:57 +0000 (+0200) Subject: Fix getting the name of a GV(SV) kid of RV2SV that caused 'print' to segfault X-Git-Tag: v0.07_01~1 X-Git-Url: http://git.vpit.fr/?a=commitdiff_plain;ds=inline;h=cf93cbf9ffecce3a44dad3b7e89d79bf2933e19e;p=perl%2Fmodules%2Findirect.git Fix getting the name of a GV(SV) kid of RV2SV that caused 'print' to segfault --- diff --git a/indirect.xs b/indirect.xs index 1f1ab9a..5ec4e03 100644 --- a/indirect.xs +++ b/indirect.xs @@ -146,10 +146,26 @@ STATIC OP *(*indirect_old_ck_rv2sv)(pTHX_ OP *) = 0; STATIC OP *indirect_ck_rv2sv(pTHX_ OP *o) { if (indirect_hint()) { OP *op = cUNOPo->op_first; - SV *name = cSVOPx_sv(op); - if (SvPOK(name) && (SvTYPE(name) >= SVt_PV)) { + const char *name = NULL; + STRLEN len; + switch (op->op_type) { + case OP_GV: + case OP_GVSV: { + GV *gv = cGVOPx_gv(op); + name = GvNAME(gv); + len = GvNAMELEN(gv); + break; + } + default: { + SV *sv = cSVOPx_sv(op); + if (SvPOK(sv) && (SvTYPE(sv) >= SVt_PV)) + name = SvPV_const(sv, len); + break; + } + } + if (name) { SV *sv = sv_2mortal(newSVpvn("$", 1)); - sv_catsv(sv, name); + sv_catpvn(sv, name, len); o = CALL_FPTR(indirect_old_ck_rv2sv)(aTHX_ o); indirect_map_store(o, indirect_find(sv, PL_parser->oldbufptr), sv); return o;