fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2024-11-10 15:31:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

console.c (Con_TabComplete): eliminated string buffer overflow issues.

Browse source 
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@735 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
sezero 2012-09-27 09:55:41 +00:00
parent 1b58beef6d
commit da7af706d8
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
quakespasm/Quake/console.c
View file

@ -950,11 +950,15 @@ void Con_TabComplete (void)
const char *matched_map = BuildMapList(partial);
if (!*matched_map)
return;
Q_strcpy (partial, matched_map);
Q_strcpy (c, partial);
q_strlcpy (partial, matched_map, MAXCMDLINE);
*c = '\0';
q_strlcat (key_lines[edit_line], partial, MAXCMDLINE);
key_linepos = c - key_lines[edit_line] + Q_strlen(matched_map); //set new cursor position
if (key_linepos >= MAXCMDLINE)
key_linepos = MAXCMDLINE - 1;
// if only one match, append a space
if ((key_lines[edit_line][key_linepos] == 0) && map_singlematch)
if (key_linepos < MAXCMDLINE - 1 &&
key_lines[edit_line][key_linepos] == 0 && map_singlematch)
{
key_lines[edit_line][key_linepos] = ' ';
key_linepos++;
@ -976,7 +980,7 @@ void Con_TabComplete (void)
mark = Hunk_LowMark();
if (!key_tabpartial[0]) //first time through
{
Q_strcpy (key_tabpartial, partial);
q_strlcpy (key_tabpartial, partial, MAXCMDLINE);
BuildTabList (key_tabpartial);
if (!tablist)
@ -1021,13 +1025,17 @@ void Con_TabComplete (void)
Hunk_FreeToLowMark(mark); //it's okay to free it here because match is a pointer to persistent data
// insert new match into edit line
Q_strcpy (partial, match); //first copy match string
Q_strcat (partial, key_lines[edit_line] + key_linepos); //then add chars after cursor
Q_strcpy (c, partial); //now copy all of this into edit line
q_strlcpy (partial, match, MAXCMDLINE); //first copy match string
q_strlcat (partial, key_lines[edit_line] + key_linepos, MAXCMDLINE); //then add chars after cursor
*c = '\0'; //now copy all of this into edit line
q_strlcat (key_lines[edit_line], partial, MAXCMDLINE);
key_linepos = c - key_lines[edit_line] + Q_strlen(match); //set new cursor position
if (key_linepos >= MAXCMDLINE)
key_linepos = MAXCMDLINE - 1;
// if cursor is at end of string, let's append a space to make life easier
if (key_lines[edit_line][key_linepos] == 0 && bash_singlematch)
if (key_linepos < MAXCMDLINE - 1 &&
key_lines[edit_line][key_linepos] == 0 && bash_singlematch)
{
key_lines[edit_line][key_linepos] = ' ';
key_linepos++;