security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-18 14:17:03 +01:00
Code Activity

g10: Fix memory leak.

Browse Source 
* g10/getkey.c (finish_lookup): Clarify that we do not return a
reference.
(lookup): Clarify the relation between RET_KEYBLOCK and RET_FOUND_KEY.
Check arguments.  Actually release the node if it is not returned.

Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
Justus Winter 2016-11-15 15:11:39 +01:00
parent 1d03cc77e1
commit d20107f6da
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
g10/getkey.c
View File

@ -3341,6 +3341,9 @@ merge_selfsigs (KBNODE keyblock)
* in CTX. If so, return the node of an appropriate key or subkey. * in CTX. If so, return the node of an appropriate key or subkey.
* Otherwise, return NULL if there was no appropriate key. * Otherwise, return NULL if there was no appropriate key.
* *
* Note that we do not return a reference, i.e. the result must not be
* freed using 'release_kbnode'.
*
* In case the primary key is not required, select a suitable subkey. * In case the primary key is not required, select a suitable subkey.
* We need the primary key if PUBKEY_USAGE_CERT is set in REQ_USAGE or * We need the primary key if PUBKEY_USAGE_CERT is set in REQ_USAGE or
* we are in PGP6 or PGP7 mode and PUBKEY_USAGE_SIG is set in * we are in PGP6 or PGP7 mode and PUBKEY_USAGE_SIG is set in
@ -3660,7 +3663,12 @@ print_status_key_considered (kbnode_t keyblock, unsigned int flags)
all of the self-signed data into the keys, subkeys and user id all of the self-signed data into the keys, subkeys and user id
packets (see the merge_selfsigs for details). packets (see the merge_selfsigs for details).
On success the key's keyblock is stored at *RET_KEYBLOCK. */ On success the key's keyblock is stored at *RET_KEYBLOCK, and the
specific subkey is stored at *RET_FOUND_KEY. Note that we do not
return a reference in *RET_FOUND_KEY, i.e. the result must not be
freed using 'release_kbnode', and it is only valid until
*RET_KEYBLOCK is deallocated. Therefore, if RET_FOUND_KEY is not
NULL, then RET_KEYBLOCK must not be NULL. */
static int static int
lookup (getkey_ctx_t ctx, kbnode_t *ret_keyblock, kbnode_t *ret_found_key, lookup (getkey_ctx_t ctx, kbnode_t *ret_keyblock, kbnode_t *ret_found_key,
int want_secret) int want_secret)
@ -3671,6 +3679,7 @@ lookup (getkey_ctx_t ctx, kbnode_t *ret_keyblock, kbnode_t *ret_found_key,
KBNODE found_key = NULL; KBNODE found_key = NULL;
unsigned int infoflags; unsigned int infoflags;
log_assert (ret_found_key == NULL || ret_keyblock != NULL);
if (ret_keyblock) if (ret_keyblock)
*ret_keyblock = NULL; *ret_keyblock = NULL;
@ -3732,8 +3741,10 @@ lookup (getkey_ctx_t ctx, kbnode_t *ret_keyblock, kbnode_t *ret_found_key,
if (!rc) if (!rc)
{ {
if (ret_keyblock) if (ret_keyblock)
*ret_keyblock = keyblock; /* Return the keyblock. */ {
keyblock = NULL; *ret_keyblock = keyblock; /* Return the keyblock. */
keyblock = NULL;
}
} }
else if (gpg_err_code (rc) == GPG_ERR_NOT_FOUND && no_suitable_key) else if (gpg_err_code (rc) == GPG_ERR_NOT_FOUND && no_suitable_key)
rc = want_secret? GPG_ERR_UNUSABLE_SECKEY : GPG_ERR_UNUSABLE_PUBKEY; rc = want_secret? GPG_ERR_UNUSABLE_SECKEY : GPG_ERR_UNUSABLE_PUBKEY;