upstream commit

add back the changes from rev 1.206, djm reverted this by
 mistake in rev 1.207

1 files changed, 5 insertions, 2 deletions

diff --git a/packet.c b/packet.c
index b1219c85b..5e18de437 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.208 2015/02/13 18:57:00 markus Exp $ */
+/* $OpenBSD: packet.c,v 1.209 2015/03/11 00:48:39 jsg Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * 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,
             (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;
@@ -1278,8 +1279,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 (;;) {