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_ctcp().


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

14
source/ctcp.c
View File

@@ -1109,9 +1109,9 @@ extern char *do_ctcp (char *from, char *to, char *str)
flag = check_ignore(from, FromUserHost, to, IGNORE_CTCPS, NULL); flag = check_ignore(from, FromUserHost, to, IGNORE_CTCPS, NULL);
in_ctcp_flag++; in_ctcp_flag++;
strmcpy(local_ctcp_buffer, str, IRCD_BUFFER_SIZE-2); strlcpy(local_ctcp_buffer, str, sizeof local_ctcp_buffer - 2);
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);
@@ -1271,10 +1271,10 @@ extern char *do_ctcp (char *from, char *to, char *str)
/* If its an inline CTCP paste it back in */ /* If its an inline CTCP paste it back in */
#ifdef WANT_DLL #ifdef WANT_DLL
if ((ctcp_cmd[i].flag & CTCP_INLINE) || (dll && (dll->flag & CTCP_INLINE))) if ((ctcp_cmd[i].flag & CTCP_INLINE) || (dll && (dll->flag & CTCP_INLINE)))
strmcat(local_ctcp_buffer, ptr, BIG_BUFFER_SIZE); strlcat(local_ctcp_buffer, ptr, sizeof local_ctcp_buffer);
#else #else
if ((ctcp_cmd[i].flag & CTCP_INLINE)) if ((ctcp_cmd[i].flag & CTCP_INLINE))
strmcat(local_ctcp_buffer, ptr, BIG_BUFFER_SIZE); strlcat(local_ctcp_buffer, ptr, sizeof local_ctcp_buffer);
#endif #endif
/* If its interesting, tell the user. */ /* If its interesting, tell the user. */
#ifdef WANT_DLL #ifdef WANT_DLL
@@ -1304,10 +1304,8 @@ extern char *do_ctcp (char *from, char *to, char *str)
reset_display_target(); reset_display_target();
in_ctcp_flag--; in_ctcp_flag--;
if (*local_ctcp_buffer) strlcpy(str, local_ctcp_buffer, BIG_BUFFER_SIZE);
return strcpy(str, local_ctcp_buffer); return str;
else
return empty_string;
} }