philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use strlcat, rather than strmcat, in command_completion(). Pass sizeof buffer,

Browse Source 
rather than a constant, to snprintf and strlcat.


git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@384 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Tim Cava
2013-10-13 18:48:42 +00:00
parent 44874b28b3
commit 50d29b1f29
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/commands.c
View File

@@ -4199,7 +4199,7 @@ void command_completion(char unused, char *not_used)
#ifdef WANT_DLL #ifdef WANT_DLL
IrcCommandDll *dll = NULL; IrcCommandDll *dll = NULL;
#endif #endif
char buffer[BIG_BUFFER_SIZE + 1]; char buffer[BIG_BUFFER_SIZE];
malloc_strcpy(&line, get_input()); malloc_strcpy(&line, get_input());
@@ -4255,7 +4255,7 @@ void command_completion(char unused, char *not_used)
#endif #endif
if ((alias_cnt == 1) && (cmd_cnt == 0) && (dll_cnt <= 0)) if ((alias_cnt == 1) && (cmd_cnt == 0) && (dll_cnt <= 0))
{ {
snprintf(buffer, BIG_BUFFER_SIZE, "%s%s %s", firstcmdchar, *aliases, rest); snprintf(buffer, sizeof buffer, "%s%s %s", firstcmdchar, *aliases, rest);
set_input(buffer); set_input(buffer);
new_free((char **)aliases); new_free((char **)aliases);
new_free((char **)&aliases); new_free((char **)&aliases);
@@ -4270,7 +4270,7 @@ void command_completion(char unused, char *not_used)
#endif #endif
)) ))
{ {
snprintf(buffer, BIG_BUFFER_SIZE, "%s%s%s %s", snprintf(buffer, sizeof buffer, "%s%s%s %s",
firstcmdchar, firstcmdchar,
do_aliases ? empty_string : firstcmdchar, do_aliases ? empty_string : firstcmdchar,
#ifdef WANT_DLL #ifdef WANT_DLL
@@ -4293,8 +4293,8 @@ void command_completion(char unused, char *not_used)
{ {
if (i == 0) if (i == 0)
bitchsay("Commands:"); bitchsay("Commands:");
strmcat(buffer, command[i].name, BIG_BUFFER_SIZE); strlcat(buffer, command[i].name, sizeof buffer);
strmcat(buffer, space, BIG_BUFFER_SIZE); strlcat(buffer, space, sizeof buffer);
if (++c == 4) if (++c == 4)
{ {
put_it("%s", convert_output_format("$G $[15]0 $[15]1 $[15]2 $[15]3", "%s", buffer)); put_it("%s", convert_output_format("$G $[15]0 $[15]1 $[15]2 $[15]3", "%s", buffer));
@@ -4313,8 +4313,8 @@ void command_completion(char unused, char *not_used)
{ {
if (com && *com && my_strnicmp(com, dll->name, strlen(com))) if (com && *com && my_strnicmp(com, dll->name, strlen(com)))
continue; continue;
strmcat(buffer, dll->name, BIG_BUFFER_SIZE); strlcat(buffer, dll->name, sizeof buffer);
strmcat(buffer, space, BIG_BUFFER_SIZE); strlcat(buffer, space, sizeof bufer);
if (++c == 4) if (++c == 4)
{ {
put_it("%s", convert_output_format("$G $[15]0 $[15]1 $[15]2 $[15]3", "%s", buffer)); put_it("%s", convert_output_format("$G $[15]0 $[15]1 $[15]2 $[15]3", "%s", buffer));
@@ -4334,8 +4334,8 @@ void command_completion(char unused, char *not_used)
{ {
if (i == 0) if (i == 0)
bitchsay("Aliases:"); bitchsay("Aliases:");
strmcat(buffer, aliases[i], BIG_BUFFER_SIZE); strlcat(buffer, aliases[i], sizeof buffer);
strmcat(buffer, space, BIG_BUFFER_SIZE); strlcat(buffer, space, sizeof buffer);
if (++c == 4) if (++c == 4)
{ {
put_it("%s", convert_output_format("$G $[15]0 $[15]1 $[15]2 $[15]3", "%s", buffer)); put_it("%s", convert_output_format("$G $[15]0 $[15]1 $[15]2 $[15]3", "%s", buffer));
@@ -4356,8 +4356,8 @@ void command_completion(char unused, char *not_used)
{ {
if (i == 0) if (i == 0)
bitchsay("Functions:"); bitchsay("Functions:");
strmcat(buffer, functions[i], BIG_BUFFER_SIZE); strlcat(buffer, functions[i], sizeof buffer);
strmcat(buffer, space, BIG_BUFFER_SIZE); strlcat(buffer, space, sizeof buffer);
if (++c == 4) if (++c == 4)
{ {
put_it("%s", convert_output_format("$G $[15]0 $[15]1 $[15]2 $[15]3", "%s", buffer)); put_it("%s", convert_output_format("$G $[15]0 $[15]1 $[15]2 $[15]3", "%s", buffer));