diff options
| author |   millert <millert@openbsd.org> | 2002-02-16 19:34:45 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 2002-02-16 19:34:45 +0000 |
| commit | 43312ba707f13e77fba5ec79289c466494a1cf74 (patch) | |
| tree | 03e4058f31c903aa500f3060a1643588d354ff69 | |
| parent | please even more architectures. the various linkers we have are just weird (diff) | |
| download | wireguard-openbsd-43312ba707f13e77fba5ec79289c466494a1cf74.tar.xz wireguard-openbsd-43312ba707f13e77fba5ec79289c466494a1cf74.zip | |
Deal with snprintf returning >= sizeof(buf) and simplify some
of the arithmetic. deraadt@ OK
| -rw-r--r-- | libexec/rlogind/rlogind.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/libexec/rlogind/rlogind.c b/libexec/rlogind/rlogind.c index 2fd8f112020..e4e50159725 100644 --- a/libexec/rlogind/rlogind.c +++ b/libexec/rlogind/rlogind.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rlogind.c,v 1.32 2002/02/15 19:16:36 deraadt Exp $ */ +/* $OpenBSD: rlogind.c,v 1.33 2002/02/16 19:34:45 millert Exp $ */ /*- * Copyright (c) 1983, 1988, 1989, 1993 @@ -41,7 +41,7 @@ static char copyright[] = #ifndef lint /* from: static char sccsid[] = "@(#)rlogind.c 8.1 (Berkeley) 6/4/93"; */ -static char *rcsid = "$OpenBSD: rlogind.c,v 1.32 2002/02/15 19:16:36 deraadt Exp $"; +static char *rcsid = "$OpenBSD: rlogind.c,v 1.33 2002/02/16 19:34:45 millert Exp $"; #endif /* not lint */ /* @@ -594,23 +594,28 @@ fatal(f, msg, syserr) char *msg; int syserr; { - int len; + int len = 0; char buf[BUFSIZ], *bp = buf; /* * Prepend binary one to message if we haven't sent * the magic null as confirmation. */ - if (!confirmed) + if (!confirmed) { *bp++ = '\01'; /* error indicator */ + len++; + } if (syserr) - len = snprintf(bp, buf + sizeof buf - bp, + len += snprintf(bp, sizeof(buf) - len, "rlogind: %s: %s.\r\n", msg, strerror(errno)); else - len = snprintf(bp, buf + sizeof buf - bp, + len += snprintf(bp, sizeof(buf) - len, "rlogind: %s.\r\n", msg); - (void) write(f, buf, bp + len - buf); + if (len >= sizeof(buf)) + len = sizeof(buf) - 1; + + (void) write(f, buf, len); exit(1); } |