diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2016-03-11 00:15:29 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2016-03-11 00:15:29 +0000 |
| commit | acc1a9ef8333c798c210fa94be6af4d5fe2dd794 (patch) | |
| tree | 755a41a3dcaa10393f1e0d17469bd517b8a0989a /crypto/openssh/cipher.c | |
| parent | 62ee4b69cd038bc55efbaeb27454ef07d39831b3 (diff) | |
| parent | ff4b04e0d6105849f2b141c035ecd92a4ebc6d97 (diff) | |
| download | src-acc1a9ef8333c798c210fa94be6af4d5fe2dd794.tar.gz src-acc1a9ef8333c798c210fa94be6af4d5fe2dd794.zip | |
Upgrade to OpenSSH 7.2p2.
Notes
Notes:
svn path=/head/; revision=296633
Diffstat (limited to 'crypto/openssh/cipher.c')
| -rw-r--r-- | crypto/openssh/cipher.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/crypto/openssh/cipher.c b/crypto/openssh/cipher.c index 02dae6f9fa1f..13847e5bd7b6 100644 --- a/crypto/openssh/cipher.c +++ b/crypto/openssh/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; } |