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

Use memcpy plus a manual NUL termination when copying the interface name

Browse Source 
from the sdl because strlcpy requires that the source string be
NUL-terminated unlike strncpy.

Submitted by:	Peter Jeremy <PeterJeremy at optushome dot com dot au>
This commit is contained in:
Brooks Davis 2004-01-31 22:59:03 +00:00
parent 4543f32e21
commit bbe513dbf8
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sbin/ifconfig/ifconfig.c
View File

@ -596,9 +596,11 @@ main(int argc, char *argv[])
addrcount++; addrcount++;
next += nextifm->ifm_msglen; next += nextifm->ifm_msglen;
} }
strlcpy(name, sdl->sdl_data, memcpy(name, sdl->sdl_data,
sizeof(name) <= sdl->sdl_nlen ? sizeof(name) < sdl->sdl_nlen ?
sizeof(name) : sdl->sdl_nlen + 1); sizeof(name)-1 : sdl->sdl_nlen);
name[sizeof(name) < sdl->sdl_nlen ?
sizeof(name)-1 : sdl->sdl_nlen] = '\0';
if (all || namesonly) { if (all || namesonly) {
if (uponly) if (uponly)