51 lines
2.1 KiB
Diff
51 lines
2.1 KiB
Diff
|
diff -up lua-5.4.3/lua-5.4.3-tests/cstack.lua.bug7 lua-5.4.3/lua-5.4.3-tests/cstack.lua
|
||
|
|
--- lua-5.4.3/lua-5.4.3-tests/cstack.lua.bug7 2022-01-24 11:29:00.412334975 -0500
|
||
|
|
+++ lua-5.4.3/lua-5.4.3-tests/cstack.lua 2022-01-24 11:32:08.101405924 -0500
|
||
|
|
@@ -103,6 +103,20 @@ do
|
||
|
|
end
|
||
|
|
|
||
|
|
|
||
|
|
+do -- bug in 5.4.2
|
||
|
|
+ print("nesting coroutines running after recoverable errors")
|
||
|
|
+ local count = 0
|
||
|
|
+ local function foo()
|
||
|
|
+ count = count + 1
|
||
|
|
+ pcall(1) -- create an error
|
||
|
|
+ -- running now inside 'precover' ("protected recover")
|
||
|
|
+ coroutine.wrap(foo)() -- call another coroutine
|
||
|
|
+ end
|
||
|
|
+ checkerror("C stack overflow", foo)
|
||
|
|
+ print("final count: ", count)
|
||
|
|
+end
|
||
|
|
+
|
||
|
|
+
|
||
|
|
if T then
|
||
|
|
print("testing stack recovery")
|
||
|
|
local N = 0 -- trace number of calls
|
||
|
|
diff -up lua-5.4.3/src/ldo.c.bug7 lua-5.4.3/src/ldo.c
|
||
|
|
--- lua-5.4.3/src/ldo.c.bug7 2022-01-24 11:27:41.226883145 -0500
|
||
|
|
+++ lua-5.4.3/src/ldo.c 2022-01-24 11:28:45.374249175 -0500
|
||
|
|
@@ -728,11 +728,10 @@ static void resume (lua_State *L, void *
|
||
|
|
StkId firstArg = L->top - n; /* first argument */
|
||
|
|
CallInfo *ci = L->ci;
|
||
|
|
if (L->status == LUA_OK) /* starting a coroutine? */
|
||
|
|
- ccall(L, firstArg - 1, LUA_MULTRET, 1); /* just call its body */
|
||
|
|
+ ccall(L, firstArg - 1, LUA_MULTRET, 0); /* just call its body */
|
||
|
|
else { /* resuming from previous yield */
|
||
|
|
lua_assert(L->status == LUA_YIELD);
|
||
|
|
L->status = LUA_OK; /* mark that it is running (again) */
|
||
|
|
- luaE_incCstack(L); /* control the C stack */
|
||
|
|
if (isLua(ci)) { /* yielded inside a hook? */
|
||
|
|
L->top = firstArg; /* discard arguments */
|
||
|
|
luaV_execute(L, ci); /* just continue running Lua code */
|
||
|
|
@@ -783,6 +782,9 @@ LUA_API int lua_resume (lua_State *L, lu
|
||
|
|
else if (L->status != LUA_YIELD) /* ended with errors? */
|
||
|
|
return resume_error(L, "cannot resume dead coroutine", nargs);
|
||
|
|
L->nCcalls = (from) ? getCcalls(from) : 0;
|
||
|
|
+ if (getCcalls(L) >= LUAI_MAXCCALLS)
|
||
|
|
+ return resume_error(L, "C stack overflow", nargs);
|
||
|
|
+ L->nCcalls++;
|
||
|
|
luai_userstateresume(L, nargs);
|
||
|
|
api_checknelems(L, (L->status == LUA_OK) ? nargs + 1 : nargs);
|
||
|
|
status = luaD_rawrunprotected(L, resume, &nargs);
|