mirror of
https://github.com/LuaJIT/LuaJIT.git
synced 2025-02-07 23:24:09 +00:00
Merge branch 'master' into v2.1
This commit is contained in:
commit
7a0cf5fd4c
@ -777,6 +777,7 @@ LJ_NOINLINE void lj_err_mem(lua_State *L)
|
|||||||
{
|
{
|
||||||
if (L->status == LUA_ERRERR+1) /* Don't touch the stack during lua_open. */
|
if (L->status == LUA_ERRERR+1) /* Don't touch the stack during lua_open. */
|
||||||
lj_vm_unwind_c(L->cframe, LUA_ERRMEM);
|
lj_vm_unwind_c(L->cframe, LUA_ERRMEM);
|
||||||
|
if (curr_funcisL(L)) L->top = curr_topL(L);
|
||||||
setstrV(L, L->top++, lj_err_str(L, LJ_ERR_ERRMEM));
|
setstrV(L, L->top++, lj_err_str(L, LJ_ERR_ERRMEM));
|
||||||
lj_err_throw(L, LUA_ERRMEM);
|
lj_err_throw(L, LUA_ERRMEM);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user