diff options
| author | Mike Pall <mike> | 2022-12-09 00:20:05 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2022-12-09 00:20:05 +0100 |
| commit | b2791179ef96d652d00d78d2a8780af690537f6a (patch) | |
| tree | 45acb535105791dbc8996a0777cbaf80bcef441a | |
| parent | cc96ab9d513582703f8663a8775a935b56db32b7 (diff) | |
| download | luajit2-b2791179ef96d652d00d78d2a8780af690537f6a.tar.gz | |
Correct fix for stack check when recording BC_VARG.
Reported by Yichun Zhang.
| -rw-r--r-- | src/lj_record.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lj_record.c b/src/lj_record.c index f7552db0..dee53327 100644 --- a/src/lj_record.c +++ b/src/lj_record.c @@ -1522,6 +1522,8 @@ static void rec_varg(jit_State *J, BCReg dst, ptrdiff_t nresults) } else if (dst + nresults > J->maxslot) { J->maxslot = dst + (BCReg)nresults; } + if (J->baseslot + J->maxslot >= LJ_MAX_JSLOTS) + lj_trace_err(J, LJ_TRERR_STACKOV); for (i = 0; i < nresults; i++) J->base[dst+i] = i < nvararg ? getslot(J, i - nvararg - 1) : TREF_NIL; } else { /* Unknown number of varargs passed to trace. */ @@ -1602,8 +1604,6 @@ static void rec_varg(jit_State *J, BCReg dst, ptrdiff_t nresults) lj_trace_err_info(J, LJ_TRERR_NYIBC); } } - if (J->baseslot + J->maxslot >= LJ_MAX_JSLOTS) - lj_trace_err(J, LJ_TRERR_STACKOV); } /* -- Record allocations -------------------------------------------------- */ |