CVE-2013-7490: Fixed risk of memory corruption with many arguments to methods RT#86744 · perl5-dbi/dbi@a8b98e9

@@ -3147,6 +3147,7 @@ XS(XS_DBI_dispatch); /* prototype to pass -Wmissing-prototypes */

XS(XS_DBI_dispatch)

{

dXSARGS;

dORIGMARK;

dMY_CXT;

SV *h = ST(0); /* the DBI handle we are working with */

@@ -3447,6 +3448,7 @@ XS(XS_DBI_dispatch)

XPUSHs(*hp);

PUTBACK;

call_method("DESTROY", G_DISCARD|G_EVAL|G_KEEPERR);

MSPAGAIN;

}

else {

imp_xxh_t *imp_xxh = dbih_getcom2(aTHX_ *hp, 0);

@@ -3539,8 +3541,8 @@ XS(XS_DBI_dispatch)

SV *code = SvRV(*hook_svp);

I32 skip_dispatch = 0;

if (trace_level)

PerlIO_printf(DBILOGFP, "%c {{ %s callback %s being invoked\n",

(PL_dirty?’!’:’ '), meth_name, neatsvpv(*hook_svp,0));

PerlIO_printf(DBILOGFP, "%c {{ %s callback %s being invoked with %ld args\n",

(PL_dirty?’!’:’ '), meth_name, neatsvpv(*hook_svp,0), (long)items);

/* we don’t use ENTER,SAVETMPS & FREETMPS,LEAVE because we may need mortal

* results to live long enough to be returned to our caller

@@ -3562,7 +3564,7 @@ XS(XS_DBI_dispatch)

}

PUTBACK;

outitems = call_sv(code, G_ARRAY); /* call the callback code */

SPAGAIN;

MSPAGAIN;

/* The callback code can undef $_ to indicate to skip dispatch */

skip_dispatch = !SvOK(DEFSV);

@@ -3890,7 +3892,7 @@ XS(XS_DBI_dispatch)

XPUSHs(&PL_sv_yes);

PUTBACK;

call_method("STORE", G_DISCARD);

SPAGAIN;

MSPAGAIN;

}

}

}

@@ -4047,7 +4049,7 @@ XS(XS_DBI_dispatch)

XPUSHs( result );

PUTBACK;

items = call_sv(*hook_svp, G_SCALAR);

SPAGAIN;

MSPAGAIN;

status = (items) ? POPs : &PL_sv_undef;

PUTBACK;

if (trace_level)