thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2026-04-22 01:52:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed crash in smlua_set_sync_table_field_from_network()

Browse source
This commit is contained in:
MysterD 2023-04-11 15:02:51 -07:00
parent 1406f15995
commit de9e5f8550
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/pc/lua/smlua_sync_table.c
View file

@ -271,7 +271,11 @@ static bool smlua_sync_table_send_field(u8 toLocalIndex, int stackIndex, bool al
// send over the network
if (!gLuaInitializingScript) {
network_send_lua_sync_table(toLocalIndex, seq, modRemoteIndex, sUnwoundLntsCount, sUnwoundLnts, &lntValue);
if (sUnwoundLntsCount < 2) {
LOG_ERROR("Sent sync table field packet with an invalid key count: %u", sUnwoundLntsCount);
} else {
network_send_lua_sync_table(toLocalIndex, seq, modRemoteIndex, sUnwoundLntsCount, sUnwoundLnts, &lntValue);
}
}
@ -311,6 +315,12 @@ void smlua_set_sync_table_field_from_network(u64 seq, u16 modRemoteIndex, u16 ln
return;
}
// sanity check key count
if (lntKeyCount < 2) {
LOG_ERROR("Received sync table field packet with an invalid key count: %u", lntKeyCount);
return;
}
lua_getglobal(L, "_G"); // get global table
lua_getfield(L, LUA_REGISTRYINDEX, mod->relativePath); // get the file's "global" table
lua_remove(L, -2); // remove global table

2
src/pc/network/packets/packet_lua_sync_table.c
View file

@ -36,6 +36,7 @@ void network_send_lua_sync_table(u8 toLocalIndex, u64 seq, u16 modRemoteIndex, u
//LOG_INFO(" %s", smlua_lnt_to_str(&lntKeys[i]));
}
//LOG_INFO(" -> %s", smlua_lnt_to_str(lntValue));
//LOG_INFO(" count %u", lntKeyCount);
if (!packet_write_lnt(&p, lntValue)) { return; }
@ -66,6 +67,7 @@ void network_receive_lua_sync_table(struct Packet* p) {
//LOG_INFO(" %s", smlua_lnt_to_str(&lntKeys[i]));
}
//LOG_INFO(" -> %s", smlua_lnt_to_str(&lntValue));
//LOG_INFO(" count %u", lntKeyCount);
if (!packet_read_lnt(p, &lntValue)) { goto cleanup; }