GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: Cleanup gpgme_key_unref frees

Browse Source 
* src/key.c (gpgme_key_unref): Nowadays we assume free(NULL) is ok.
This commit is contained in:
Andre Heinecke 2017-02-01 18:06:54 +01:00
parent b5075030be
commit 8ede86795a
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/key.c
View File

@ -341,14 +341,10 @@ gpgme_key_unref (gpgme_key_t key)
while (subkey) while (subkey)
{ {
gpgme_subkey_t next = subkey->next; gpgme_subkey_t next = subkey->next;
if (subkey->fpr) free (subkey->fpr);
free (subkey->fpr); free (subkey->curve);
if (subkey->curve) free (subkey->keygrip);
free (subkey->curve); free (subkey->card_number);
if (subkey->keygrip)
free (subkey->keygrip);
if (subkey->card_number)
free (subkey->card_number);
free (subkey); free (subkey);
subkey = next; subkey = next;
} }
@ -393,15 +389,10 @@ gpgme_key_unref (gpgme_key_t key)
uid = next_uid; uid = next_uid;
} }
if (key->issuer_serial) free (key->issuer_serial);
free (key->issuer_serial); free (key->issuer_name);
if (key->issuer_name) free (key->chain_id);
free (key->issuer_name); free (key->fpr);
if (key->chain_id)
free (key->chain_id);
if (key->fpr)
free (key->fpr);
free (key); free (key);
} }