From ef84a12d8fc3f2dacb57102d5f84bfb4025a320a Mon Sep 17 00:00:00 2001 From: deraadt <> Date: Wed, 3 Jul 2019 03:24:04 +0000 Subject: snprintf/vsnprintf return < 0 on error, rather than -1. --- src/usr.bin/nc/socks.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/usr.bin/nc/socks.c') diff --git a/src/usr.bin/nc/socks.c b/src/usr.bin/nc/socks.c index 856c3e7446..39e4331be3 100644 --- a/src/usr.bin/nc/socks.c +++ b/src/usr.bin/nc/socks.c @@ -1,4 +1,4 @@ -/* $OpenBSD: socks.c,v 1.27 2019/01/10 12:44:54 mestre Exp $ */ +/* $OpenBSD: socks.c,v 1.28 2019/07/03 03:24:02 deraadt Exp $ */ /* * Copyright (c) 1999 Niklas Hallqvist. All rights reserved. @@ -334,7 +334,7 @@ socks_connect(const char *host, const char *port, "CONNECT %s:%d HTTP/1.0\r\n", host, ntohs(serverport)); } - if (r == -1 || (size_t)r >= sizeof(buf)) + if (r < 0 || (size_t)r >= sizeof(buf)) errx(1, "hostname too long"); r = strlen(buf); @@ -357,7 +357,7 @@ socks_connect(const char *host, const char *port, errx(1, "Proxy username/password too long"); r = snprintf(buf, sizeof(buf), "Proxy-Authorization: " "Basic %s\r\n", resp); - if (r == -1 || (size_t)r >= sizeof(buf)) + if (r < 0 || (size_t)r >= sizeof(buf)) errx(1, "Proxy auth response too long"); r = strlen(buf); if ((cnt = atomicio(vwrite, proxyfd, buf, r)) != r) -- cgit v1.2.3-55-g6feb