New upstream release (7.2).

1 files changed, 2 insertions, 3 deletions

diff --git a/cipher.c b/cipher.c
index 02dae6f9f..13847e5bd 100644
--- a/cipher.c
+++ b/cipher.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cipher.c,v 1.100 2015/01/14 10:29:45 djm Exp $ */
+/* $OpenBSD: cipher.c,v 1.101 2015/12/10 17:08:40 mmcc Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -353,8 +353,7 @@ cipher_init(struct sshcipher_ctx *cc, const struct sshcipher *cipher,
         if (cipher->discard_len > 0) {
                 if ((junk = malloc(cipher->discard_len)) == NULL ||
                     (discard = malloc(cipher->discard_len)) == NULL) {
-                        if (junk != NULL)
-                                free(junk);
+                        free(junk);
                         ret = SSH_ERR_ALLOC_FAIL;
                         goto bad;
                 }