security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-05-30 22:08:02 +02:00
Code Activity

g10: Fix another memory leak.

Browse Source 
* g10/skclist.c (enum_secret_keys): Use SK_LIST instead of pubkey_t.

--

The use of pubkey_t was wrong.  The use is just a list of keys, not
with keyblock.  With SK_LIST, release_sk_list releases memory by
free_public_key.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2018-09-14 08:11:45 +09:00
parent 2eb481e8cc
commit 60c880bda5
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
g10/skclist.c
View File

@ -337,7 +337,7 @@ enum_secret_keys (ctrl_t ctrl, void **context, PKT_public_key *sk)
kbnode_t keyblock; kbnode_t keyblock;
kbnode_t node; kbnode_t node;
getkey_ctx_t ctx; getkey_ctx_t ctx;
pubkey_t results; SK_LIST results;
} *c = *context; } *c = *context;
if (!c) if (!c)
@ -358,7 +358,7 @@ enum_secret_keys (ctrl_t ctrl, void **context, PKT_public_key *sk)
/* Free the context. */ /* Free the context. */
xfree (c->serialno); xfree (c->serialno);
free_strlist (c->card_list); free_strlist (c->card_list);
pubkeys_free (c->results); release_sk_list (c->results);
release_kbnode (c->keyblock); release_kbnode (c->keyblock);
getkey_end (ctrl, c->ctx); getkey_end (ctrl, c->ctx);
xfree (c); xfree (c);
@ -516,7 +516,7 @@ enum_secret_keys (ctrl_t ctrl, void **context, PKT_public_key *sk)
if (c->node->pkt->pkttype == PKT_PUBLIC_KEY if (c->node->pkt->pkttype == PKT_PUBLIC_KEY
|| c->node->pkt->pkttype == PKT_PUBLIC_SUBKEY) || c->node->pkt->pkttype == PKT_PUBLIC_SUBKEY)
{ {
pubkey_t r; SK_LIST r;
/* Skip this candidate if it's already enumerated. */ /* Skip this candidate if it's already enumerated. */
for (r = c->results; r; r = r->next) for (r = c->results; r; r = r->next)
@ -537,7 +537,6 @@ enum_secret_keys (ctrl_t ctrl, void **context, PKT_public_key *sk)
} }
r->pk = sk; r->pk = sk;
r->keyblock = NULL;
r->next = c->results; r->next = c->results;
c->results = r; c->results = r;