diff options
author | djm@openbsd.org <djm@openbsd.org> | 2017-02-28 06:10:08 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-02-28 17:10:41 +1100 |
commit | d7abb771bd5a941b26144ba400a34563a1afa589 (patch) | |
tree | d52d77a08d12c732f337842a926b97ae75632f49 /packet.c | |
parent | 78142e3ab3887e53a968d6e199bcb18daaf2436e (diff) |
upstream commit
small memleak: free fd_set on connection timeout (though
we are heading to exit anyway). From Tom Rix in bz#2683
Upstream-ID: 10e3dadbb8199845b66581473711642d9e6741c4
Diffstat (limited to 'packet.c')
-rw-r--r-- | packet.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: packet.c,v 1.245 2017/02/03 23:03:33 djm Exp $ */ +/* $OpenBSD: packet.c,v 1.246 2017/02/28 06:10:08 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1466,8 +1466,10 @@ ssh_packet_read_seqnr(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p) break; } } - if (r == 0) - return SSH_ERR_CONN_TIMEOUT; + if (r == 0) { + r = SSH_ERR_CONN_TIMEOUT; + goto out; + } /* Read data from the socket. */ len = read(state->connection_in, buf, sizeof(buf)); if (len == 0) { |