Merge branch 'master' into v2.1

1 files changed, 1 insertions, 0 deletions

diff --git a/src/lj_err.c b/src/lj_err.c
index 563c7706..283c3d18 100644
--- a/src/lj_err.c
+++ b/src/lj_err.c
@@ -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. */
     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));
   lj_err_throw(L, LUA_ERRMEM);
 }