diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2013-10-25 23:04:52 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2013-10-25 23:04:52 +0000 |
| commit | adbfcdcd569d8ec6daa5a16b64500858e3bd7364 (patch) | |
| tree | 76fda0a3e52fbda60b53864fcb82de6ce065d537 /usr.bin | |
| parent | 5b7d2b2fb23d145ae5b0efd3ca8254b28829b36b (diff) | |
fix crash when using ProxyCommand caused by previous commit - was calling
freeaddrinfo(NULL); spotted by sthen@ and Tim Ruehsen, patch by sthen@
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index 9402157800c..71aec4c65e3 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.390 2013/10/24 08:19:36 djm Exp $ */ +/* $OpenBSD: ssh.c,v 1.391 2013/10/25 23:04:51 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -933,7 +933,9 @@ main(int ac, char **av) options.use_privileged_port) != 0) exit(255); - freeaddrinfo(addrs); + if (addrs != NULL) + freeaddrinfo(addrs); + packet_set_timeout(options.server_alive_interval, options.server_alive_count_max); |