diff options
| author |   deraadt <deraadt@openbsd.org> | 2001-11-07 18:49:21 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2001-11-07 18:49:21 +0000 |
| commit | d2e70dea2e50a6eed7e47950bb6673ed546fa965 (patch) | |
| tree | 980536663bb8e5435f059cadd97b8da7db592397 /lib/libwrap/socket.c | |
| parent | crank strings to 256 so they can hold a full hostname (diff) | |
| download | wireguard-openbsd-d2e70dea2e50a6eed7e47950bb6673ed546fa965.tar.xz wireguard-openbsd-d2e70dea2e50a6eed7e47950bb6673ed546fa965.zip | |
avoid strcpy and sprintf
Diffstat (limited to 'lib/libwrap/socket.c')
| -rw-r--r-- | lib/libwrap/socket.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/libwrap/socket.c b/lib/libwrap/socket.c index 46e24cec8a6..6e5532f8401 100644 --- a/lib/libwrap/socket.c +++ b/lib/libwrap/socket.c @@ -1,4 +1,4 @@ -/* $OpenBSD: socket.c,v 1.3 2000/10/14 00:56:15 itojun Exp $ */ +/* $OpenBSD: socket.c,v 1.4 2001/11/07 18:49:21 deraadt Exp $ */ /* * This module determines the type of socket (datagram, stream), the client @@ -21,7 +21,7 @@ #if 0 static char sccsid[] = "@(#) socket.c 1.15 97/03/21 19:27:24"; #else -static char rcsid[] = "$OpenBSD: socket.c,v 1.3 2000/10/14 00:56:15 itojun Exp $"; +static char rcsid[] = "$OpenBSD: socket.c,v 1.4 2001/11/07 18:49:21 deraadt Exp $"; #endif #endif @@ -66,7 +66,7 @@ char *name; if (strchr(name, '.') == 0 || strlen(name) >= MAXHOSTNAMELEN - 1) { return (gethostbyname(name)); } else { - sprintf(dot_name, "%s.", name); + snprintf(dot_name, sizeof(dot_name), "%s.", name); return (gethostbyname(dot_name)); } } @@ -201,7 +201,7 @@ struct host_info *host; } if ((hp = gethostbyaddr(ap, alen, af)) != 0) { - STRN_CPY(host->name, hp->h_name, sizeof(host->name)); + strlcpy(host->name, hp->h_name, sizeof(host->name)); /* * Verify that the address is a member of the address list returned @@ -262,7 +262,9 @@ struct host_info *host; inet_ntop(af, ap, hbuf, sizeof(hbuf)), STRING_LENGTH, hp->h_name); } - strcpy(host->name, paranoid); /* name is bad, clobber it */ + + /* name is bad, clobber it */ + strlcpy(host->name, paranoid, sizeof(host->name)); } } |