From: Mike Pall <mike>
Date: Wed, 9 Nov 2022 10:01:41 +0000 (+0100)
Subject: Ensure correct stack top for OOM error message.
X-Git-Tag: v2.1.ROLLING~40^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca8d3257bb44e42100c7910c47dcdcf01f494187;p=thirdparty%2FLuaJIT.git

Ensure correct stack top for OOM error message.

Reported by Sergey Kaplun.
---

diff --git a/src/lj_err.c b/src/lj_err.c
index b677b655..d9783722 100644
--- a/src/lj_err.c
+++ b/src/lj_err.c
@@ -488,6 +488,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);
 }