From 4af1709cf774475ce5d1bc3ddcc165f6c222897d Mon Sep 17 00:00:00 2001 From: "jsg@openbsd.org" Date: Mon, 9 Feb 2015 23:22:37 +0000 Subject: upstream commit fix some leaks in error paths ok markus@ --- packet.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packet.c b/packet.c index f9ce08412..8b8ab0c0c 100644 --- a/packet.c +++ b/packet.c @@ -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 * Copyright (c) 1995 Tatu Ylonen , 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, (const u_char *)"", 0, NULL, 0, CIPHER_DECRYPT)) != 0) { error("%s: cipher_init failed: %s", __func__, ssh_err(r)); + free(ssh); return 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 * been sent. */ - if ((r = ssh_packet_write_wait(ssh)) != 0) + if ((r = ssh_packet_write_wait(ssh)) != 0) { + free(setp); return r; + } /* Stay in the loop until we have received a complete packet. */ for (;;) { -- cgit v1.2.3