From 8af91b8c9bd4c8cb7e10ca32c2736115d30719b3 Mon Sep 17 00:00:00 2001 From: Indev Date: Sun, 24 Sep 2023 13:59:19 +0300 Subject: [PATCH] Attempt to fix some replays segfaulting when trying unarchive lua tables from demo --- src/lua_script.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/lua_script.c b/src/lua_script.c index e0da24b40..fe61e6e50 100644 --- a/src/lua_script.c +++ b/src/lua_script.c @@ -1520,10 +1520,21 @@ static void UnArchiveTablesDemo(void) lua_rawgeti(gL, TABLESINDEX, i); while (true) { - if (UnArchiveValueDemo(TABLESINDEX, NULL) == 1) // read key + UINT8 ret; + + ret = UnArchiveValueDemo(TABLESINDEX, NULL); + if (ret == 3) + lua_pushnil(gL); + else if (ret == 1) // read key break; - if (UnArchiveValueDemo(TABLESINDEX, NULL) == 2) // read value + + ret = UnArchiveValueDemo(TABLESINDEX, NULL); + + if (ret == 3) + lua_pushnil(gL); + else if (ret == 2) // read value n++; + 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);