gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 23:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix potential hang in UCLO redirection handling in hooks.

Browse Source
This commit is contained in:
Mike Pall 2010-03-10 22:13:23 +01:00
parent c56d791316
commit 4f19a15bd9
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lj_dispatch.c
View File

@ -333,15 +333,13 @@ static void callhook(lua_State *L, int event, BCLine line)
static BCReg cur_topslot(GCproto *pt, const BCIns *pc, uint32_t nres) static BCReg cur_topslot(GCproto *pt, const BCIns *pc, uint32_t nres)
{ {
BCIns ins = pc[-1]; BCIns ins = pc[-1];
for (;;) { if (bc_op(ins) == BC_UCLO)
switch (bc_op(ins)) { ins = pc[bc_j(ins)];
case BC_UCLO: ins = pc[bc_j(ins)]; break; switch (bc_op(ins)) {
case BC_CALLM: case BC_CALLM: case BC_CALLMT: return bc_a(ins) + bc_c(ins) + nres-1+1;
case BC_CALLMT: return bc_a(ins) + bc_c(ins) + nres-1+1; case BC_RETM: return bc_a(ins) + bc_d(ins) + nres-1;
case BC_RETM: return bc_a(ins) + bc_d(ins) + nres-1; case BC_TSETM: return bc_a(ins) + nres-1;
case BC_TSETM: return bc_a(ins) + nres-1; default: return pt->framesize;
default: return pt->framesize;
}
} }
} }