upstream commit

plug a memory leak; from Maxime Villard.

ok djm@
This commit is contained in:
daniel@openbsd.org 2014-10-14 03:09:59 +00:00 committed by Damien Miller
parent b1ba15f388
commit 165bc87862

View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-ed25519.c,v 1.4 2014/06/24 01:13:21 djm Exp $ */ /* $OpenBSD: ssh-ed25519.c,v 1.5 2014/10/14 03:09:59 daniel Exp $ */
/* /*
* Copyright (c) 2013 Markus Friedl <markus@openbsd.org> * Copyright (c) 2013 Markus Friedl <markus@openbsd.org>
* *
@ -128,8 +128,10 @@ ssh_ed25519_verify(const struct sshkey *key,
r = SSH_ERR_INVALID_FORMAT; r = SSH_ERR_INVALID_FORMAT;
goto out; goto out;
} }
if (datalen >= SIZE_MAX - len) if (datalen >= SIZE_MAX - len) {
return SSH_ERR_INVALID_ARGUMENT; r = SSH_ERR_INVALID_ARGUMENT;
goto out;
}
smlen = len + datalen; smlen = len + datalen;
mlen = smlen; mlen = smlen;
if ((sm = malloc(smlen)) == NULL || (m = xmalloc(mlen)) == NULL) { if ((sm = malloc(smlen)) == NULL || (m = xmalloc(mlen)) == NULL) {