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 

fix some leaks in error paths ok markus@
This commit is contained in:
jsg@openbsd.org 2015-02-09 23:22:37 +00:00 committed by Damien Miller
parent fd36834871
commit 4af1709cf7
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packet.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: packet.c,v 1.205 2015/01/30 01:13:33 djm Exp $ */ /* $OpenBSD: packet.c,v 1.206 2015/02/09 23:22:37 jsg 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
@ -290,6 +290,7 @@ ssh_packet_set_connection(struct ssh *ssh, int fd_in, int fd_out)
(r = cipher_init(&state->receive_context, none, (r = cipher_init(&state->receive_context, none,
(const u_char *)"", 0, NULL, 0, CIPHER_DECRYPT)) != 0) { (const u_char *)"", 0, NULL, 0, CIPHER_DECRYPT)) != 0) {
error("%s: cipher_init failed: %s", __func__, ssh_err(r)); error("%s: cipher_init failed: %s", __func__, ssh_err(r));
free(ssh);
return NULL; return NULL;
} }
state->newkeys[MODE_IN] = state->newkeys[MODE_OUT] = NULL; state->newkeys[MODE_IN] = state->newkeys[MODE_OUT] = NULL;
@ -1273,8 +1274,10 @@ 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);
return r; 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 (;;) {