diff options
| author | Werner Koch <[email protected]> | 2011-09-20 17:24:52 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2011-09-20 17:24:52 +0000 |
| commit | 6cf8890dc1f551a1e87ed8b8e67a733e95b1bb6d (patch) | |
| tree | a4485063c34975876ad80d0898af16379d095bc3 /g10/keyedit.c | |
| parent | tests: avoid use of freed pointer (diff) | |
| download | gnupg-6cf8890dc1f551a1e87ed8b8e67a733e95b1bb6d.tar.gz gnupg-6cf8890dc1f551a1e87ed8b8e67a733e95b1bb6d.zip | |
Allow NULL for free_public_key.
Diffstat (limited to 'g10/keyedit.c')
| -rw-r--r-- | g10/keyedit.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/g10/keyedit.c b/g10/keyedit.c index 62b193a81..fd42439a8 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -2253,8 +2253,7 @@ keyedit_passwd (ctrl_t ctrl, const char *username) leave: release_kbnode (keyblock); - if (pk) - free_public_key (pk); + free_public_key (pk); if (err) { log_info ("error changing the passphrase for `%s': %s\n", @@ -3327,9 +3326,7 @@ menu_addrevoker (ctrl_t ctrl, kbnode_t pub_keyblock, int sensitive) { char *answer; - if (revoker_pk) - free_public_key (revoker_pk); - + free_public_key (revoker_pk); revoker_pk = xmalloc_clear (sizeof (*revoker_pk)); tty_printf ("\n"); @@ -3453,8 +3450,7 @@ menu_addrevoker (ctrl_t ctrl, kbnode_t pub_keyblock, int sensitive) fail: if (sig) free_seckey_enc (sig); - if (revoker_pk) - free_public_key (revoker_pk); + free_public_key (revoker_pk); return 0; } |