summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2017-02-28 06:10:08 +0000
committerDamien Miller <djm@mindrot.org>2017-02-28 17:10:41 +1100
commitd7abb771bd5a941b26144ba400a34563a1afa589 (patch)
treed52d77a08d12c732f337842a926b97ae75632f49
parent78142e3ab3887e53a968d6e199bcb18daaf2436e (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
-rw-r--r--packet.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/packet.c b/packet.c
index 94e8460ca..01e2d45bd 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: packet.c,v 1.245 2017/02/03 23:03:33 djm Exp $ */ 1/* $OpenBSD: packet.c,v 1.246 2017/02/28 06:10:08 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
@@ -1466,8 +1466,10 @@ ssh_packet_read_seqnr(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p)
1466 break; 1466 break;
1467 } 1467 }
1468 } 1468 }
1469 if (r == 0) 1469 if (r == 0) {
1470 return SSH_ERR_CONN_TIMEOUT; 1470 r = SSH_ERR_CONN_TIMEOUT;
1471 goto out;
1472 }
1471 /* Read data from the socket. */ 1473 /* Read data from the socket. */
1472 len = read(state->connection_in, buf, sizeof(buf)); 1474 len = read(state->connection_in, buf, sizeof(buf));
1473 if (len == 0) { 1475 if (len == 0) {