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

Fix incorrect truncation in cluster() caused by strlcpy().

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@377 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Kevin Easton
2013-09-28 14:26:57 +00:00
parent d7bdc25960
commit 717d2e88b7
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/misc.c
View File

@@ -3179,6 +3179,7 @@ char *cluster (char *hostname)
if (!hostname) if (!hostname)
return NULL; return NULL;
*result = 0;
atsign = strchr(hostname, '@'); atsign = strchr(hostname, '@');
if (atsign) { if (atsign) {
if (*hostname == '~') { if (*hostname == '~') {
@@ -3188,17 +3189,13 @@ char *cluster (char *hostname)
if (ident_len <= 9) { if (ident_len <= 9) {
/* copy ident@ */ /* copy ident@ */
strlcpy(result, hostname, ident_len + 1); strncat(result, hostname, ident_len + 1);
} else { } else {
strlcpy(result, hostname, 8); strncat(result, hostname, 8);
result[8] = '*'; strcat(result, "*@");
result[9] = '@';
result[10] = '\0';
} }
} }
hostname = atsign + 1; hostname = atsign + 1;
} else {
*result = 0;
} }
strlcpy(temphost, hostname, sizeof temphost); strlcpy(temphost, hostname, sizeof temphost);