diff options
| author |   millert <millert@openbsd.org> | 2019-11-04 17:33:28 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 2019-11-04 17:33:28 +0000 |
| commit | db8da9c7e033587d91c43fee9b36cfc16b020783 (patch) | |
| tree | cc72feca0aaccf916a1214b612973d700956c3f4 /usr.bin/nc/socks.c | |
| parent | Apply more 'static' to help the compiler (diff) | |
| download | wireguard-openbsd-db8da9c7e033587d91c43fee9b36cfc16b020783.tar.xz wireguard-openbsd-db8da9c7e033587d91c43fee9b36cfc16b020783.zip | |
Fix an out of bound read/write when using a proxy.
From Lucas AT sexy DOT is. OK job@ kn@
Diffstat (limited to 'usr.bin/nc/socks.c')
| -rw-r--r-- | usr.bin/nc/socks.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/nc/socks.c b/usr.bin/nc/socks.c index 5ec5c95cd61..9766be7da49 100644 --- a/usr.bin/nc/socks.c +++ b/usr.bin/nc/socks.c @@ -1,4 +1,4 @@ -/* $OpenBSD: socks.c,v 1.29 2019/07/29 15:19:03 benno Exp $ */ +/* $OpenBSD: socks.c,v 1.30 2019/11/04 17:33:28 millert Exp $ */ /* * Copyright (c) 1999 Niklas Hallqvist. All rights reserved. @@ -53,7 +53,7 @@ #define SOCKS_DOMAIN 3 #define SOCKS_IPV6 4 -int remote_connect(const char *, const char *, struct addrinfo); +int remote_connect(const char *, const char *, struct addrinfo, char *); int socks_connect(const char *, const char *, struct addrinfo, const char *, const char *, struct addrinfo, int, const char *); @@ -201,7 +201,7 @@ socks_connect(const char *host, const char *port, if (authretry++ > 3) errx(1, "Too many authentication failures"); - proxyfd = remote_connect(proxyhost, proxyport, proxyhints); + proxyfd = remote_connect(proxyhost, proxyport, proxyhints, NULL); if (proxyfd < 0) return (-1); |