diff options
| author | obrien <obrien@FreeBSD.org> | 1998-08-23 22:52:09 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 1998-08-23 22:52:09 +0000 |
| commit | 203b7d3a36b8e8be4852d4b82e69c57860efdfc3 (patch) | |
| tree | 91aa7e9beeaea1d52c2661b5ab2d96dc3792d701 /contrib/amd/wire-test | |
| parent | e0e79339cc48dfca7ab913bdeecf17b24b4e4e21 (diff) | |
| download | FreeBSD-src-203b7d3a36b8e8be4852d4b82e69c57860efdfc3.zip FreeBSD-src-203b7d3a36b8e8be4852d4b82e69c57860efdfc3.tar.gz | |
* Check getopt()'s return with -1, not EOF
* protect a few potential buffer overflows
Obtained from: NetBSD
Diffstat (limited to 'contrib/amd/wire-test')
| -rw-r--r-- | contrib/amd/wire-test/wire-test.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/amd/wire-test/wire-test.c b/contrib/amd/wire-test/wire-test.c index c53094b..27525d0 100644 --- a/contrib/amd/wire-test/wire-test.c +++ b/contrib/amd/wire-test/wire-test.c @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: wire-test.c,v 5.2.2.2 1992/06/07 18:06:46 jsp Exp jsp $ + * $Id: wire-test.c,v 1.1.1.1 1998/08/23 22:07:21 obrien Exp $ * */ @@ -50,7 +50,7 @@ #define STRMAX 100 /* dummy variables */ -char *progname, hostname[MAXHOSTNAMELEN]; +char *progname, hostname[MAXHOSTNAMELEN + 1]; int orig_umask, foreground, debug_flags; pid_t mypid; serv_state amd_state; @@ -69,10 +69,11 @@ main(int argc, char **argv) mypid = getpid(); orig_umask = umask(0); - if (gethostname(hostname, MAXHOSTNAMELEN) < 0) { + if (gethostname(hostname, sizeof hostname) < 0) { perror(argv[0]); exit(1); } + hostname[sizeof(hostname) - 1] = '\0'; /* get list of networks */ getwire(&networkName1, &networkNumber1); |
