diff options
| author | mmcc@openbsd.org <mmcc@openbsd.org> | 2015-12-10 17:08:40 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-12-11 13:23:14 +1100 |
| commit | d59ce08811bf94111c2f442184cf7d1257ffae24 (patch) | |
| tree | 5885ad687f762834250c9c3f5b53b3f1b750c9f1 /cipher.c | |
| parent | 8e56dd46cb37879c73bce2d6032cf5e7f82d5a71 (diff) | |
| download | openssh-git-d59ce08811bf94111c2f442184cf7d1257ffae24.tar.gz | |
upstream commit
Remove NULL-checks before free().
ok dtucker@
Upstream-ID: e3d3cb1ce900179906af36517b5eea0fb15e6ef8
Diffstat (limited to 'cipher.c')
| -rw-r--r-- | cipher.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -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; } |