summaryrefslogtreecommitdiff
path: root/cipher.c
diff options
context:
space:
mode:
authormmcc@openbsd.org <mmcc@openbsd.org>2015-12-10 17:08:40 +0000
committerDamien Miller <djm@mindrot.org>2015-12-11 13:23:14 +1100
commitd59ce08811bf94111c2f442184cf7d1257ffae24 (patch)
tree5885ad687f762834250c9c3f5b53b3f1b750c9f1 /cipher.c
parent8e56dd46cb37879c73bce2d6032cf5e7f82d5a71 (diff)
upstream commit
Remove NULL-checks before free(). ok dtucker@ Upstream-ID: e3d3cb1ce900179906af36517b5eea0fb15e6ef8
Diffstat (limited to 'cipher.c')
-rw-r--r--cipher.c5
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 @@
1/* $OpenBSD: cipher.c,v 1.100 2015/01/14 10:29:45 djm Exp $ */ 1/* $OpenBSD: cipher.c,v 1.101 2015/12/10 17:08:40 mmcc Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * 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,
353 if (cipher->discard_len > 0) { 353 if (cipher->discard_len > 0) {
354 if ((junk = malloc(cipher->discard_len)) == NULL || 354 if ((junk = malloc(cipher->discard_len)) == NULL ||
355 (discard = malloc(cipher->discard_len)) == NULL) { 355 (discard = malloc(cipher->discard_len)) == NULL) {
356 if (junk != NULL) 356 free(junk);
357 free(junk);
358 ret = SSH_ERR_ALLOC_FAIL; 357 ret = SSH_ERR_ALLOC_FAIL;
359 goto bad; 358 goto bad;
360 } 359 }