mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-01-31 06:51:11 +01:00
Code Issues Projects Releases Wiki Activity

BUILD/MEDIUM: standard: get rid of the last strcpy()

Browse Source 
OpenBSD complains about our use of strcpy() in standard.c. The checks
were OK and we didn't fall into the category of "almost always misused",
but it's very simple to fix it so better do it before a problem happens.

src/standard.o(.text+0x26ab): In function `str2sa_range':
src/standard.c:718: warning: strcpy() is almost always misused, please use strlcpy()
This commit is contained in:
Willy Tarreau 2014-04-14 14:49:00 +02:00
parent 0e82b92a97
commit 94ef3f3115
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/standard.c
View File

@ -700,6 +700,7 @@ struct sockaddr_storage *str2sa_range(const char *str, int *low, int *high, char
else if (ss.ss_family == AF_UNIX) {
int prefix_path_len;
int max_path_len;
int adr_len;
/* complete unix socket path name during startup or soft-restart is
* <unix_bind_prefix><path>.<pid>.<bak|tmp>
@ -708,18 +709,15 @@ struct sockaddr_storage *str2sa_range(const char *str, int *low, int *high, char
max_path_len = (sizeof(((struct sockaddr_un *)&ss)->sun_path) - 1) -
(prefix_path_len ? prefix_path_len + 1 + 5 + 1 + 3 : 0);
if (strlen(str2) > max_path_len) {
adr_len = strlen(str2);
if (adr_len > max_path_len) {
memprintf(err, "socket path '%s' too long (max %d)\n", str, max_path_len);
goto out;
}
if (pfx) {
if (prefix_path_len)
memcpy(((struct sockaddr_un *)&ss)->sun_path, pfx, prefix_path_len);
strcpy(((struct sockaddr_un *)&ss)->sun_path + prefix_path_len, str2);
}
else {
strcpy(((struct sockaddr_un *)&ss)->sun_path, str2);
}
memcpy(((struct sockaddr_un *)&ss)->sun_path + prefix_path_len, str2, adr_len + 1);
}
else { /* IPv4 and IPv6 */
port1 = strrchr(str2, ':');