=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh.c,v retrieving revision 1.390 retrieving revision 1.391 diff -u -r1.390 -r1.391 --- src/usr.bin/ssh/ssh.c 2013/10/24 08:19:36 1.390 +++ src/usr.bin/ssh/ssh.c 2013/10/25 23:04:51 1.391 @@ -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 * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -933,7 +933,9 @@ 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);