security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

gpg: Use usual free semantics for packet structure free functions.

Browse source 
* g10/free-packet.c (free_attributes): Turn function into a nop for a
NULL arg.
(free_user_id): Ditto.
(free_compressed): Ditto.
(free_encrypted): Ditto.
(free_plaintext): Ditto.
(release_public_key_parts): Avoid extra check for NULL.
* g10/getkey.c (get_best_pubkey_byname): Ditto.
--

This change avoid surprises because it is common that function named
like free and taking a pointer also have similar semantics.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2016-11-15 16:23:41 +01:00
parent 12834e84ac
commit 8ea3b4c410
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
2 changed files with 75 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

15
g10/getkey.c
View file

@ -1602,29 +1602,25 @@ get_best_pubkey_byname (ctrl_t ctrl, GETKEY_CTX *retctx, PKT_public_key *pk,
{
/* New key is better. */
release_public_key_parts (&best.key);
if (best.uid)
free_user_id (best.uid);
free_user_id (best.uid);
best = new;
}
else if (diff > 0)
{
/* Old key is better. */
release_public_key_parts (&new.key);
if (new.uid)
free_user_id (new.uid);
free_user_id (new.uid);
}
else
{
/* A tie. Keep the old key. */
release_public_key_parts (&new.key);
if (new.uid)
free_user_id (new.uid);
free_user_id (new.uid);
}
}
getkey_end (ctx);
ctx = NULL;
if (best.uid)
free_user_id (best.uid);
free_user_id (best.uid);
if (best.valid)
{
@ -3604,8 +3600,7 @@ finish_lookup (kbnode_t keyblock, unsigned int req_usage, int want_exact,
if (latest_key)
{
pk = latest_key->pkt->pkt.public_key;
if (pk->user_id)
free_user_id (pk->user_id);
free_user_id (pk->user_id);
pk->user_id = scopy_user_id (foundu);
}