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

Use strlcpy and strlcat, rather than strmcpy, strmcat, and strcpy, in

Browse Source 
do_notice_ctcp().


git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@363 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Tim Cava
2013-08-21 05:53:18 +00:00
parent 3808071ba6
commit 1524033b3f
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/ctcp.c
View File

@@ -1342,10 +1342,10 @@ extern char *do_notice_ctcp (char *from, char *to, char *str)
in_ctcp_flag = -1; in_ctcp_flag = -1;
tbuf = stripansi(str); tbuf = stripansi(str);
strmcpy(local_ctcp_buffer, tbuf, IRCD_BUFFER_SIZE-2); strlcpy(local_ctcp_buffer, tbuf, sizeof local_ctcp_buffer - 2);
new_free(&tbuf); new_free(&tbuf);
for (;;strmcat(local_ctcp_buffer, last, IRCD_BUFFER_SIZE-2)) for (;;strlcat(local_ctcp_buffer, last, sizeof local_ctcp_buffer - 2))
{ {
split_CTCP(local_ctcp_buffer, the_ctcp, last); split_CTCP(local_ctcp_buffer, the_ctcp, last);
if (!*the_ctcp) if (!*the_ctcp)
@@ -1397,7 +1397,7 @@ extern char *do_notice_ctcp (char *from, char *to, char *str)
{ {
if ((ptr = ctcp_cmd[i].repl(ctcp_cmd + i, from, to, ctcp_argument))) if ((ptr = ctcp_cmd[i].repl(ctcp_cmd + i, from, to, ctcp_argument)))
{ {
strmcat(local_ctcp_buffer, ptr, BIG_BUFFER_SIZE); strlcat(local_ctcp_buffer, ptr, sizeof local_ctcp_buffer);
new_free(&ptr); new_free(&ptr);
continue; continue;
} }
@@ -1407,7 +1407,7 @@ extern char *do_notice_ctcp (char *from, char *to, char *str)
{ {
if ((ptr = dll->repl(dll, from, to, ctcp_argument))) if ((ptr = dll->repl(dll, from, to, ctcp_argument)))
{ {
strmcat(local_ctcp_buffer, ptr, BIG_BUFFER_SIZE); strlcat(local_ctcp_buffer, ptr, sizeof local_ctcp_buffer);
new_free(&ptr); new_free(&ptr);
continue; continue;
} }
@@ -1433,7 +1433,8 @@ extern char *do_notice_ctcp (char *from, char *to, char *str)
/* Reset the window level/logging */ /* Reset the window level/logging */
reset_display_target(); reset_display_target();
return strcpy(str, local_ctcp_buffer); strlcpy(str, local_ctcp_buffer, BIG_BUFFER_SIZE);
return str;
} }