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

Use strlcat, rather than strmcat, in fill_it_out().

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@399 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Tim Cava
2013-10-19 20:52:37 +00:00
parent 12d3fadfb1
commit 559dfdd278
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/hook.c
View File

@@ -258,7 +258,7 @@ extern int last_function_call_level;
*/ */
static char * fill_it_out (char *str, int params) static char * fill_it_out (char *str, int params)
{ {
char buffer[BIG_BUFFER_SIZE + 1]; char buffer[BIG_BUFFER_SIZE];
char *arg, char *arg,
*ptr; *ptr;
int i = 0; int i = 0;
@@ -269,19 +269,19 @@ static char * fill_it_out (char *str, int params)
while ((arg = next_arg(ptr, &ptr)) != NULL) while ((arg = next_arg(ptr, &ptr)) != NULL)
{ {
if (*buffer) if (*buffer)
strmcat(buffer, space, BIG_BUFFER_SIZE); strlcat(buffer, space, sizeof buffer);
strmcat(buffer, arg, BIG_BUFFER_SIZE); strlcat(buffer, arg, sizeof buffer);
if (++i == params) if (++i == params)
break; break;
} }
for (; i < params; i++) for (; i < params; i++)
strmcat(buffer, (i < params-1) ? " %" : " *", BIG_BUFFER_SIZE); strlcat(buffer, (i < params-1) ? " %" : " *", sizeof buffer);
if (*ptr) if (*ptr)
{ {
strmcat(buffer, space, BIG_BUFFER_SIZE); strlcat(buffer, space, sizeof buffer);
strmcat(buffer, ptr, BIG_BUFFER_SIZE); strlcat(buffer, ptr, sizeof buffer);
} }
return m_strdup(buffer); return m_strdup(buffer);
} }