AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-14 01:55:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't terminate the game if the server sends a bogus map whosevolume != dimensions

Browse Source
This commit is contained in:
UnknownShadow200 2020-02-06 17:37:34 +11:00
parent b6f8d739cf
commit 4e01518ce2
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Protocol.c
View File

@ -396,6 +396,15 @@ static void MapState_Init(struct MapState* m) {
m->allocFailed = false; m->allocFailed = false;
} }
static void FreeMapStates(void) {
Mem_Free(map.blocks);
map.blocks = NULL;
#ifdef EXTENDED_BLOCKS
Mem_Free(map2.blocks);
map2.blocks = NULL;
#endif
}
static void MapState_Read(struct MapState* m) { static void MapState_Read(struct MapState* m) {
cc_uint32 left, read; cc_uint32 left, read;
if (m->allocFailed) return; if (m->allocFailed) return;
@ -510,15 +519,18 @@ static void Classic_LevelFinalise(cc_uint8* data) {
if (map.allocFailed) return; if (map.allocFailed) return;
#ifdef EXTENDED_BLOCKS #ifdef EXTENDED_BLOCKS
if (map2.allocFailed) { Mem_Free(map.blocks); map.blocks = NULL; return; } if (map2.allocFailed) { FreeMapStates(); return; }
#endif #endif
width = Stream_GetU16_BE(&data[0]); width = Stream_GetU16_BE(data + 0);
height = Stream_GetU16_BE(&data[2]); height = Stream_GetU16_BE(data + 2);
length = Stream_GetU16_BE(&data[4]); length = Stream_GetU16_BE(data + 4);
if (map_volume != (width * height * length)) { if (map_volume != (width * height * length)) {
Logger_Abort("Blocks array size does not match volume of map"); Chat_AddRaw("&cFailed to load map, try joining a different map");
Chat_AddRaw(" &cBlocks array size does not match volume of map");
FreeMapStates();
return;
} }
World_SetNewMap(map.blocks, width, height, length); World_SetNewMap(map.blocks, width, height, length);