Merge pull request #1558 from pi-hole/update/lua

Update embedded Lua to v5.4.6
pi-hole · May 14, 2023 · bd256cd · bd256cd
2 parents b2d36ef + ec72408
commit bd256cd
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/src/lua/lcorolib.c b/src/lua/lcorolib.c
@@ -76,7 +76,7 @@ static int luaB_auxwrap (lua_State *L) {
  if (l_unlikely(r < 0)) { /* error? */
  int stat = lua_status(co);
  if (stat != LUA_OK && stat != LUA_YIELD) { /* error in the coroutine? */
- stat = lua_resetthread(co, L); /* close its tbc variables */
+ stat = lua_closethread(co, L); /* close its tbc variables */
  lua_assert(stat != LUA_OK);
  lua_xmove(co, L, 1); /* move error message to the caller */
  }
@@ -172,7 +172,7 @@ static int luaB_close (lua_State *L) {
  int status = auxstatus(L, co);
  switch (status) {
  case COS_DEAD: case COS_YIELD: {
- status = lua_resetthread(co, L);
+ status = lua_closethread(co, L);
  if (status == LUA_OK) {
  lua_pushboolean(L, 1);
  return 1;

diff --git a/src/lua/lstate.c b/src/lua/lstate.c
@@ -339,7 +339,7 @@ int luaE_resetthread (lua_State *L, int status) {
 }
 
 
-LUA_API int lua_resetthread (lua_State *L, lua_State *from) {
+LUA_API int lua_closethread (lua_State *L, lua_State *from) {
  int status;
  lua_lock(L);
  L->nCcalls = (from) ? getCcalls(from) : 0;
@@ -349,6 +349,14 @@ LUA_API int lua_resetthread (lua_State *L, lua_State *from) {
 }
 
 
+/*
+** Deprecated! Use 'lua_closethread' instead.
+*/
+LUA_API int lua_resetthread (lua_State *L) {
+ return lua_closethread(L, NULL);
+}
+
+
 LUA_API lua_State *lua_newstate (lua_Alloc f, void *ud) {
  int i;
  lua_State *L;

diff --git a/src/lua/lua.h b/src/lua/lua.h
@@ -18,10 +18,10 @@
 
 #define LUA_VERSION_MAJOR "5"
 #define LUA_VERSION_MINOR "4"
-#define LUA_VERSION_RELEASE "5"
+#define LUA_VERSION_RELEASE "6"
 
 #define LUA_VERSION_NUM 504
-#define LUA_VERSION_RELEASE_NUM (LUA_VERSION_NUM * 100 + 5)
+#define LUA_VERSION_RELEASE_NUM (LUA_VERSION_NUM * 100 + 6)
 
 #define LUA_VERSION "Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR
 #define LUA_RELEASE LUA_VERSION "." LUA_VERSION_RELEASE
@@ -163,7 +163,8 @@ extern const char lua_ident[];
 LUA_API lua_State *(lua_newstate) (lua_Alloc f, void *ud);
 LUA_API void (lua_close) (lua_State *L);
 LUA_API lua_State *(lua_newthread) (lua_State *L);
-LUA_API int (lua_resetthread) (lua_State *L, lua_State *from);
+LUA_API int (lua_closethread) (lua_State *L, lua_State *from);
+LUA_API int (lua_resetthread) (lua_State *L); /* Deprecated! */
 
 LUA_API lua_CFunction (lua_atpanic) (lua_State *L, lua_CFunction panicf);