diff options
| author |   deraadt <deraadt@openbsd.org> | 2019-07-03 03:24:01 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2019-07-03 03:24:01 +0000 |
| commit | 515e489c3d599b9cfcdf9cf6842ac49f92e154d6 (patch) | |
| tree | 9ce211473951e1baf5c99e08c2c35012292670f1 /usr.sbin/tftpd | |
| parent | sync (diff) | |
| download | wireguard-openbsd-515e489c3d599b9cfcdf9cf6842ac49f92e154d6.tar.xz wireguard-openbsd-515e489c3d599b9cfcdf9cf6842ac49f92e154d6.zip | |
snprintf/vsnprintf return < 0 on error, rather than -1.
Diffstat (limited to 'usr.sbin/tftpd')
| -rw-r--r-- | usr.sbin/tftpd/tftpd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/tftpd/tftpd.c b/usr.sbin/tftpd/tftpd.c index 5dd3533a2cd..4c0316d6463 100644 --- a/usr.sbin/tftpd/tftpd.c +++ b/usr.sbin/tftpd/tftpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tftpd.c,v 1.42 2019/06/28 13:32:51 deraadt Exp $ */ +/* $OpenBSD: tftpd.c,v 1.43 2019/07/03 03:24:03 deraadt Exp $ */ /* * Copyright (c) 2012 David Gwynne <dlg@uq.edu.au> @@ -991,7 +991,7 @@ validate_access(struct tftp_client *client, const char *requested) */ ret = snprintf(rewritten, sizeof(rewritten), "%s/%s", getip(&client->ss), requested); - if (ret == -1 || ret >= sizeof(rewritten)) + if (ret < 0 || ret >= sizeof(rewritten)) return (ENAMETOOLONG + 100); filename = rewritten; } else { @@ -1502,7 +1502,7 @@ oack(struct tftp_client *client) n = snprintf(bp, size, "%s%c%lld", opt_names[i], '\0', options[i].o_reply); - if (n == -1 || n >= size) { + if (n < 0 || n >= size) { lwarnx("oack: no buffer space"); goto error; } |