security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-20 14:37:08 +01:00
Code Activity

gpg: Eliminate a memory leak.

Browse Source 
* g10/trustdb.c (validate_key_list): Don't leak the keyblocks on
failure.

--
Signed-off-by: Neal H. Walfield <neal@g10code.com>
This commit is contained in:
Neal H. Walfield 2015-10-29 10:01:43 +01:00
parent ef052591ba
commit d68bdc553a
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
g10/trustdb.c
View File

@ -1729,9 +1729,8 @@ validate_key_list (KEYDB_HANDLE hd, KeyHashTable full_trust,
} }
if (rc) if (rc)
{ {
log_error ("keydb_search_first failed: %s\n", gpg_strerror (rc)); log_error ("keydb_search(first) failed: %s\n", gpg_strerror (rc));
xfree (keys); goto die;
return NULL;
} }
desc.mode = KEYDB_SEARCH_MODE_NEXT; /* change mode */ desc.mode = KEYDB_SEARCH_MODE_NEXT; /* change mode */
@ -1746,8 +1745,7 @@ validate_key_list (KEYDB_HANDLE hd, KeyHashTable full_trust,
if (rc) if (rc)
{ {
log_error ("keydb_get_keyblock failed: %s\n", gpg_strerror (rc)); log_error ("keydb_get_keyblock failed: %s\n", gpg_strerror (rc));
xfree (keys); goto die;
return NULL;
} }
if ( keyblock->pkt->pkttype != PKT_PUBLIC_KEY) if ( keyblock->pkt->pkttype != PKT_PUBLIC_KEY)
@ -1804,12 +1802,16 @@ validate_key_list (KEYDB_HANDLE hd, KeyHashTable full_trust,
if (rc && gpg_err_code (rc) != GPG_ERR_NOT_FOUND) if (rc && gpg_err_code (rc) != GPG_ERR_NOT_FOUND)
{ {
log_error ("keydb_search_next failed: %s\n", gpg_strerror (rc)); log_error ("keydb_search_next failed: %s\n", gpg_strerror (rc));
xfree (keys); goto die;
return NULL;
} }
keys[nkeys].keyblock = NULL; keys[nkeys].keyblock = NULL;
return keys; return keys;
die:
keys[nkeys].keyblock = NULL;
release_key_array (keys);
return NULL;
} }
/* Caller must sync */ /* Caller must sync */