diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | ssh.c | 6 |
2 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,10 @@ | |||
1 | 20131026 | ||
2 | - (djm) OpenBSD CVS Sync | ||
3 | - djm@cvs.openbsd.org 2013/10/25 23:04:51 | ||
4 | [ssh.c] | ||
5 | fix crash when using ProxyCommand caused by previous commit - was calling | ||
6 | freeaddrinfo(NULL); spotted by sthen@ and Tim Ruehsen, patch by sthen@ | ||
7 | |||
1 | 20131025 | 8 | 20131025 |
2 | - (djm) [ssh-keygen.c ssh-keysign.c sshconnect1.c sshd.c] Remove | 9 | - (djm) [ssh-keygen.c ssh-keysign.c sshconnect1.c sshd.c] Remove |
3 | unnecessary arc4random_stir() calls. The only ones left are to ensure | 10 | unnecessary arc4random_stir() calls. The only ones left are to ensure |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh.c,v 1.390 2013/10/24 08:19:36 djm Exp $ */ | 1 | /* $OpenBSD: ssh.c,v 1.391 2013/10/25 23:04:51 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -965,7 +965,9 @@ main(int ac, char **av) | |||
965 | options.use_privileged_port) != 0) | 965 | options.use_privileged_port) != 0) |
966 | exit(255); | 966 | exit(255); |
967 | 967 | ||
968 | freeaddrinfo(addrs); | 968 | if (addrs != NULL) |
969 | freeaddrinfo(addrs); | ||
970 | |||
969 | packet_set_timeout(options.server_alive_interval, | 971 | packet_set_timeout(options.server_alive_interval, |
970 | options.server_alive_count_max); | 972 | options.server_alive_count_max); |
971 | 973 | ||