upstream: prevent leak in sshsig_match_principals; ok djm@
OpenBSD-Commit-ID: 594f61ad4819ff5c72dfe99ba666a17f0e1030ae
This commit is contained in:
parent
19d3ee2f3a
commit
4086bd6652
7
sshsig.c
7
sshsig.c
|
@ -1,4 +1,4 @@
|
||||||
/* $OpenBSD: sshsig.c,v 1.33 2023/09/06 23:18:15 djm Exp $ */
|
/* $OpenBSD: sshsig.c,v 1.34 2023/12/08 09:18:39 markus Exp $ */
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2019 Google LLC
|
* Copyright (c) 2019 Google LLC
|
||||||
*
|
*
|
||||||
|
@ -1121,12 +1121,11 @@ sshsig_match_principals(const char *path, const char *principal,
|
||||||
if (ret == 0) {
|
if (ret == 0) {
|
||||||
if (nprincipals == 0)
|
if (nprincipals == 0)
|
||||||
ret = SSH_ERR_KEY_NOT_FOUND;
|
ret = SSH_ERR_KEY_NOT_FOUND;
|
||||||
|
if (nprincipalsp != 0)
|
||||||
|
*nprincipalsp = nprincipals;
|
||||||
if (principalsp != NULL) {
|
if (principalsp != NULL) {
|
||||||
*principalsp = principals;
|
*principalsp = principals;
|
||||||
principals = NULL; /* transferred */
|
principals = NULL; /* transferred */
|
||||||
}
|
|
||||||
if (nprincipalsp != 0) {
|
|
||||||
*nprincipalsp = nprincipals;
|
|
||||||
nprincipals = 0;
|
nprincipals = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue