stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-11-10 07:12:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Attempt to fix replay loading crash

Browse source
This commit is contained in:
Latapostrophe 2020-03-11 19:33:22 +01:00
parent 428dc42e2d
commit dabed0cd50
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
bin/Mingw/Release/stmlls0b Normal file
View file

Binary file not shown.

15
src/lua_script.c
View file

@ -1247,7 +1247,7 @@ static UINT8 UnArchiveValue(int TABLESINDEX)
return 0; return 0;
} }
static UINT8 UnArchiveValueDemo(int TABLESINDEX) static UINT8 UnArchiveValueDemo(int TABLESINDEX, char field[1024])
{ {
UINT8 type = READUINT8(demo_p); UINT8 type = READUINT8(demo_p);
switch (type) switch (type)
@ -1299,7 +1299,12 @@ static UINT8 UnArchiveValueDemo(int TABLESINDEX)
LUA_PushUserdata(gL, &states[READUINT16(demo_p)], META_STATE); LUA_PushUserdata(gL, &states[READUINT16(demo_p)], META_STATE);
break; break;
case ARCH_MOBJ: case ARCH_MOBJ:
LUA_PushUserdata(gL, P_FindNewPosition(READUINT32(demo_p)), META_MOBJ); demo_p += sizeof(UINT32); // Skip this data, we can't read a mobj here, it'd point to garbage and crash the game.
if (field)
CONS_Alert(CONS_WARNING,"Cannot read mobj_t stored in player variable \'%s\'. Desyncs may occur.\n", field);
else
CONS_Alert(CONS_WARNING,"Couldn't read mobj_t\n");
break; break;
case ARCH_PLAYER: case ARCH_PLAYER:
LUA_PushUserdata(gL, &players[READUINT8(demo_p)], META_PLAYER); LUA_PushUserdata(gL, &players[READUINT8(demo_p)], META_PLAYER);
@ -1383,7 +1388,7 @@ static void UnArchiveExtVarsDemo(void *pointer)
{ {
READSTRING(demo_p, field); READSTRING(demo_p, field);
CONS_Printf("%s\n", field); CONS_Printf("%s\n", field);
UnArchiveValueDemo(TABLESINDEX); UnArchiveValueDemo(TABLESINDEX, field);
lua_setfield(gL, -2, field); lua_setfield(gL, -2, field);
} }
@ -1452,9 +1457,9 @@ static void UnArchiveTablesDemo(void)
lua_rawgeti(gL, TABLESINDEX, i); lua_rawgeti(gL, TABLESINDEX, i);
while (true) while (true)
{ {
if (UnArchiveValueDemo(TABLESINDEX) == 1) // read key if (UnArchiveValueDemo(TABLESINDEX, NULL) == 1) // read key
break; break;
if (UnArchiveValueDemo(TABLESINDEX) == 2) // read value if (UnArchiveValueDemo(TABLESINDEX, NULL) == 2) // read value
n++; n++;
if (lua_isnil(gL, -2)) // if key is nil (if a function etc was accidentally saved) if (lua_isnil(gL, -2)) // if key is nil (if a function etc was accidentally saved)
{ {