d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- uri is expected to be nul-terminated (strchr used later),

Browse Source 
so use strlcpy instead of strncpy.
 - unroll the other two cases of strncpy+\0 to strlcpy.

MFC after:	2 weeks
This commit is contained in:
delphij 2015-08-31 06:11:39 +00:00
parent 7e8aee6f07
commit 12dcab665d
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
usr.bin/tftp/main.c
View File

@ -223,7 +223,7 @@ urihandling(char *URI)
char line[MAXLINE]; char line[MAXLINE];
int i; int i;
strncpy(uri, URI, ARG_MAX); strlcpy(uri, URI, ARG_MAX);
host = uri + 7; host = uri + 7;
if ((s = strchr(host, '/')) == NULL) { if ((s = strchr(host, '/')) == NULL) {
@ -320,11 +320,10 @@ setpeer0(char *host, const char *lport)
/* res->ai_addr <= sizeof(peeraddr) is guaranteed */ /* res->ai_addr <= sizeof(peeraddr) is guaranteed */
memcpy(&peer_sock, res->ai_addr, res->ai_addrlen); memcpy(&peer_sock, res->ai_addr, res->ai_addrlen);
if (res->ai_canonname) { if (res->ai_canonname) {
(void) strncpy(hostname, res->ai_canonname, (void) strlcpy(hostname, res->ai_canonname,
sizeof(hostname)); sizeof(hostname));
} else } else
(void) strncpy(hostname, host, sizeof(hostname)); (void) strlcpy(hostname, host, sizeof(hostname));
hostname[sizeof(hostname)-1] = 0;
connected = 1; connected = 1;
} }