prevent map command crash from maps with invalid or non existing mapinfo

This commit is contained in:
Alug committed 2024-10-21 15:37:44 +02:00
1 parent 393c0be407
commit dba7a7dc3c
2 files changed
+9 -1

No files matched your search

+8
View File
@@ -2983,6 +2983,14 @@ static void Command_Map_f(void)
// G_TOLFlag handles both multiplayer gametype and ignores it for !multiplayer
else
{
if (!mapheaderinfo[newmapnum-1] || mapheaderinfo[newmapnum-1] == NULL)
{
CONS_Alert(CONS_WARNING, M_GetText("Invalid mapheaderinfo for Course %s (%s)\n"), realmapname, G_BuildMapName(newmapnum));
Z_Free(realmapname);
Z_Free(mapname);
return;
}
if (!(mapheaderinfo[newmapnum-1]->typeoflevel & G_TOLFlag(newgametype)))
{
CONS_Alert(CONS_WARNING, M_GetText("Course %s (%s) doesn't support %s mode!\n(Use -force to override)\n"), realmapname, G_BuildMapName(newmapnum),
+1 -1
View File
@@ -4635,7 +4635,7 @@ INT32 G_FindMapByNameOrCode(const char *mapname, char **realmapnamep)
if (mapname[0] == '*') // current map
return gamemap;
else if (mapname[0] == '?')
return G_RandMap(G_TOLFlag(gametype), prevmap, false, 0, false, NULL);
return G_RandMap(G_TOLFlag(gametype), gamemap-1, false, 0, false, NULL);
else if (mapname[0] == '+' && mapheaderinfo[gamemap-1]) // next map
{
newmapnum = mapheaderinfo[gamemap-1]->nextlevel;