tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream commit 

don't leak 'setp' on error; noted by Nicholas Lemonias;
 ok djm@
This commit is contained in:
markus@openbsd.org 2015-03-24 20:10:08 +00:00 committed by Damien Miller
parent 7d4f96f9de
commit 4daeb67181
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
packet.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: packet.c,v 1.209 2015/03/11 00:48:39 jsg Exp $ */ /* $OpenBSD: packet.c,v 1.210 2015/03/24 20:10:08 markus Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1279,10 +1279,8 @@ ssh_packet_read_seqnr(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p)
* Since we are blocking, ensure that all written packets have * Since we are blocking, ensure that all written packets have
* been sent. * been sent.
*/ */
if ((r = ssh_packet_write_wait(ssh)) != 0) { if ((r = ssh_packet_write_wait(ssh)) != 0)
free(setp); goto out;
return r;
}
/* Stay in the loop until we have received a complete packet. */ /* Stay in the loop until we have received a complete packet. */
for (;;) { for (;;) {
@ -1340,15 +1338,20 @@ ssh_packet_read_seqnr(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p)
len = roaming_read(state->connection_in, buf, len = roaming_read(state->connection_in, buf,
sizeof(buf), &cont); sizeof(buf), &cont);
} while (len == 0 && cont); } while (len == 0 && cont);
if (len == 0) if (len == 0) {
return SSH_ERR_CONN_CLOSED; r = SSH_ERR_CONN_CLOSED;
if (len < 0) goto out;
return SSH_ERR_SYSTEM_ERROR; }
if (len < 0) {
r = SSH_ERR_SYSTEM_ERROR;
goto out;
}
/* Append it to the buffer. */ /* Append it to the buffer. */
if ((r = ssh_packet_process_incoming(ssh, buf, len)) != 0) if ((r = ssh_packet_process_incoming(ssh, buf, len)) != 0)
return r; goto out;
} }
out:
free(setp); free(setp);
return r; return r;
} }