tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: fix memory leak; Coverity CID 291848 

with/ok dtucker@

OpenBSD-Commit-ID: 37f80cb5d075ead5a00ad1b74175684ab1156ff8
This commit is contained in:
djm@openbsd.org 2023-03-29 00:18:35 +00:00 committed by Darren Tucker
parent 9ffa76e128
commit 13ae327eae
No known key found for this signature in database
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
auth-options.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: auth-options.c,v 1.98 2022/02/08 08:59:12 dtucker Exp $ */ /* $OpenBSD: auth-options.c,v 1.99 2023/03/29 00:18:35 djm Exp $ */
/* /*
* Copyright (c) 2018 Damien Miller <djm@mindrot.org> * Copyright (c) 2018 Damien Miller <djm@mindrot.org>
* *
@ -703,7 +703,7 @@ serialise_array(struct sshbuf *m, char **a, size_t n)
{ {
struct sshbuf *b; struct sshbuf *b;
size_t i; size_t i;
int r; int r = SSH_ERR_INTERNAL_ERROR;
if (n > INT_MAX) if (n > INT_MAX)
return SSH_ERR_INTERNAL_ERROR; return SSH_ERR_INTERNAL_ERROR;
@ -712,19 +712,18 @@ serialise_array(struct sshbuf *m, char **a, size_t n)
return SSH_ERR_ALLOC_FAIL; return SSH_ERR_ALLOC_FAIL;
} }
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
if ((r = sshbuf_put_cstring(b, a[i])) != 0) { if ((r = sshbuf_put_cstring(b, a[i])) != 0)
sshbuf_free(b); goto out;
return r;
}
} }
if ((r = sshbuf_put_u32(m, n)) != 0 || if ((r = sshbuf_put_u32(m, n)) != 0 ||
(r = sshbuf_put_stringb(m, b)) != 0) { (r = sshbuf_put_stringb(m, b)) != 0)
goto out;
/* success */
r = 0;
out:
sshbuf_free(b); sshbuf_free(b);
return r; return r;
} }
/* success */
return 0;
}
static int static int
deserialise_array(struct sshbuf *m, char ***ap, size_t *np) deserialise_array(struct sshbuf *m, char ***ap, size_t *np)