From a5d2f70c73e406beb617afa829a7af5b8c1d842c Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Thu, 21 Sep 2023 04:40:48 +0200
Subject: Handle OOM error on stack resize in coroutine.resume and
lua_checkstack.
Thanks to Peter Cawley. #1066
---
src/lib_base.c | 5 ++++-
src/lj_api.c | 7 ++++++-
src/lj_state.c | 12 ++++++++++++
src/lj_state.h | 1 +
4 files changed, 23 insertions(+), 2 deletions(-)
(limited to 'src')
diff --git a/src/lib_base.c b/src/lib_base.c
index dd54b9f9..4e6f8a30 100644
--- a/src/lib_base.c
+++ b/src/lib_base.c
@@ -616,7 +616,10 @@ static int ffh_resume(lua_State *L, lua_State *co, int wrap)
setstrV(L, L->base-LJ_FR2, lj_err_str(L, em));
return FFH_RES(2);
}
- lj_state_growstack(co, (MSize)(L->top - L->base));
+ if (lj_state_cpgrowstack(co, (MSize)(L->top - L->base)) != LUA_OK) {
+ cTValue *msg = --co->top;
+ lj_err_callermsg(L, strVdata(msg));
+ }
return FFH_RETRY;
}
diff --git a/src/lj_api.c b/src/lj_api.c
index 386bcada..d4048d79 100644
--- a/src/lj_api.c
+++ b/src/lj_api.c
@@ -104,7 +104,12 @@ LUA_API int lua_checkstack(lua_State *L, int size)
if (size > LUAI_MAXCSTACK || (L->top - L->base + size) > LUAI_MAXCSTACK) {
return 0; /* Stack overflow. */
} else if (size > 0) {
- lj_state_checkstack(L, (MSize)size);
+ int avail = (int)(mref(L->maxstack, TValue) - L->top);
+ if (size > avail &&
+ lj_state_cpgrowstack(L, (MSize)(size - avail)) != LUA_OK) {
+ L->top--;
+ return 0; /* Out of memory. */
+ }
}
return 1;
}
diff --git a/src/lj_state.c b/src/lj_state.c
index 6b3f58ff..569e3f38 100644
--- a/src/lj_state.c
+++ b/src/lj_state.c
@@ -130,6 +130,18 @@ void LJ_FASTCALL lj_state_growstack1(lua_State *L)
lj_state_growstack(L, 1);
}
+static TValue *cpgrowstack(lua_State *co, lua_CFunction dummy, void *ud)
+{
+ UNUSED(dummy);
+ lj_state_growstack(co, *(MSize *)ud);
+ return NULL;
+}
+
+int LJ_FASTCALL lj_state_cpgrowstack(lua_State *L, MSize need)
+{
+ return lj_vm_cpcall(L, NULL, &need, cpgrowstack);
+}
+
/* Allocate basic stack for new state. */
static void stack_init(lua_State *L1, lua_State *L)
{
diff --git a/src/lj_state.h b/src/lj_state.h
index db67f03b..3850e5a1 100644
--- a/src/lj_state.h
+++ b/src/lj_state.h
@@ -18,6 +18,7 @@ LJ_FUNC void lj_state_relimitstack(lua_State *L);
LJ_FUNC void lj_state_shrinkstack(lua_State *L, MSize used);
LJ_FUNCA void LJ_FASTCALL lj_state_growstack(lua_State *L, MSize need);
LJ_FUNC void LJ_FASTCALL lj_state_growstack1(lua_State *L);
+LJ_FUNC int LJ_FASTCALL lj_state_cpgrowstack(lua_State *L, MSize need);
static LJ_AINLINE void lj_state_checkstack(lua_State *L, MSize need)
{
--
cgit v1.2.3-55-g6feb