OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Prevent buffer overflows when using streams

Browse source
This commit is contained in:
Chris Cowan 2025-06-27 19:27:22 -07:00 • committed by Ricardo Luís Vaz Silva
commit ab7b1642bc
18 changed files with 600 additions and 388 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/playsim/bots/b_game.cpp
View file

@ -319,7 +319,7 @@ bool FCajunMaster::SpawnBot (const char *name, int color)
return true;
}
void FCajunMaster::TryAddBot (FLevelLocals *Level, uint8_t **stream, int player)
void FCajunMaster::TryAddBot (FLevelLocals *Level, TArrayView<uint8_t>& stream, int player)
{
int botshift = ReadInt8 (stream);
char *info = ReadString (stream);
@ -342,7 +342,7 @@ void FCajunMaster::TryAddBot (FLevelLocals *Level, uint8_t **stream, int player)
}
}
if (DoAddBot (Level,(uint8_t *)info, skill))
if (DoAddBot (Level, TArrayView((uint8_t*)info, strlen(info)+1), skill))
{
//Increment this.
botnum++;
@ -363,7 +363,7 @@ void FCajunMaster::TryAddBot (FLevelLocals *Level, uint8_t **stream, int player)
delete[] info;
}
bool FCajunMaster::DoAddBot (FLevelLocals *Level, uint8_t *info, botskill_t skill)
bool FCajunMaster::DoAddBot (FLevelLocals *Level, TArrayView<uint8_t> info, botskill_t skill)
{
int bnum;
@ -381,7 +381,7 @@ bool FCajunMaster::DoAddBot (FLevelLocals *Level, uint8_t *info, botskill_t skil
return false;
}
D_ReadUserInfoStrings (bnum, &info, false);
D_ReadUserInfoStrings (bnum, info, false);
multiplayer = true; //Prevents cheating and so on; emulates real netgame (almost).
players[bnum].Bot = Level->CreateThinker<DBot>();