From fa3998e942ca6600919ec5e594b11d1d1c2485ac Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Sat, 20 Jan 2018 21:18:16 +0000
Subject: [PATCH] Some fixes to prevent bad table key types causing Lua panic
errors for joining players in netgames:
* ArchiveTables: print an error if invalid key, to alert script author potentially
* UnArchiveTables: if the key is found to be nil after reading key and value, print an error and don't set them in the table
---
src/lua_script.c | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/lua_script.c b/src/lua_script.c
index 167e4a0b43..ce0f19c149 100644
--- a/src/lua_script.c
+++ b/src/lua_script.c
@@ -767,11 +767,19 @@ static void ArchiveTables(void)
lua_pushnil(gL);
while (lua_next(gL, -2))
{
- ArchiveValue(TABLESINDEX, -2); // key should be either a number or a string, ArchiveValue can handle this.
+ // Write key
+ e = ArchiveValue(TABLESINDEX, -2); // key should be either a number or a string, ArchiveValue can handle this.
+ if (e == 2) // invalid key type (function, thread, lightuserdata, or anything we don't recognise)
+ {
+ lua_pushvalue(gL, -2);
+ CONS_Alert(CONS_ERROR, "Index '%s' (%s) of table %d could not be archived!\n", lua_tostring(gL, -1), luaL_typename(gL, -1), i);
+ lua_pop(gL, 1);
+ }
+ // Write value
e = ArchiveValue(TABLESINDEX, -1);
if (e == 1)
n++; // the table contained a new table we'll have to archive. :(
- else if (e == 2)
+ else if (e == 2) // invalid value type
{
lua_pushvalue(gL, -2);
CONS_Alert(CONS_ERROR, "Type of value for table %d entry '%s' (%s) could not be archived!\n", i, lua_tostring(gL, -1), luaL_typename(gL, -1));
@@ -912,11 +920,17 @@ static void UnArchiveTables(void)
lua_rawgeti(gL, TABLESINDEX, i);
while (true)
{
- if (UnArchiveValue(TABLESINDEX) == 1)
+ if (UnArchiveValue(TABLESINDEX) == 1) // read key
break;
- if (UnArchiveValue(TABLESINDEX) == 2)
+ if (UnArchiveValue(TABLESINDEX) == 2) // read value
n++;
- lua_rawset(gL, -3);
+ if (lua_isnil(gL, -2)) // if key is nil (if a function etc was accidentally saved)
+ {
+ CONS_Alert(CONS_ERROR, "A nil key in table %d was found! (Invalid key type or corrupted save?)\n", i);
+ lua_pop(gL, 2); // pop key and value instead of setting them in the table, to prevent Lua panic errors
+ }
+ else
+ lua_rawset(gL, -3);
}
lua_pop(gL, 1);
}
--
GitLab