2 files changed, 11 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index d32065913..4519a922e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+20131026
+ - (djm) OpenBSD CVS Sync
+   - djm@cvs.openbsd.org 2013/10/25 23:04:51
+     [ssh.c]
+     fix crash when using ProxyCommand caused by previous commit - was calling
+     freeaddrinfo(NULL); spotted by sthen@ and Tim Ruehsen, patch by sthen@
+
 20131025
  - (djm) [ssh-keygen.c ssh-keysign.c sshconnect1.c sshd.c] Remove
    unnecessary arc4random_stir() calls. The only ones left are to ensure
diff --git a/ssh.c b/ssh.c
index 81921a10d..ef94591b1 100644
--- a/ssh.c
+++ b/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
@@ -965,7 +965,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);