okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix strncpy usage in botlib

Browse source 
All usage of strncpy in botlib should now either set string
terminator or use Q_strncpyz.
This commit is contained in:
Zack Middleton 2017-06-07 21:44:59 -05:00
parent 8956ab41dd
commit c12b81a273
8 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
code/botlib/be_ai_goal.c
View file

@ -281,7 +281,7 @@ itemconfig_t *LoadItemConfig(char *filename)
LibVarSet( "max_iteminfo", "256" );
}
strncpy( path, filename, MAX_PATH );
Q_strncpyz(path, filename, sizeof(path));
PC_SetBaseFolder(BOTFILESBASEFOLDER);
source = LoadSourceFile( path );
if( !source ) {
@ -314,7 +314,7 @@ itemconfig_t *LoadItemConfig(char *filename)
return NULL;
} //end if
StripDoubleQuotes(token.string);
strncpy(ii->classname, token.string, sizeof(ii->classname)-1);
Q_strncpyz(ii->classname, token.string, sizeof(ii->classname));
if (!ReadStructure(source, &iteminfo_struct, (char *) ii))
{
FreeMemory(ic);
@ -685,8 +685,7 @@ void BotGoalName(int number, char *name, int size)
{
if (li->number == number)
{
strncpy(name, itemconfig->iteminfo[li->iteminfo].name, size-1);
name[size-1] = '\0';
Q_strncpyz(name, itemconfig->iteminfo[li->iteminfo].name, size);
return;
} //end for
} //end for