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/passphrase.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/passphrase.c')
| -rw-r--r-- | g10/passphrase.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/g10/passphrase.c b/g10/passphrase.c index 481d29ed9..cc5655505 100644 --- a/g10/passphrase.c +++ b/g10/passphrase.c @@ -235,8 +235,7 @@ passphrase_get ( u32 *keyid, int mode, const char *cacheid, int repeat, memset (fpr, 0, MAX_FINGERPRINT_LEN ); if( keyid && get_pubkey( pk, keyid ) ) { - if (pk) - free_public_key( pk ); + free_public_key (pk); pk = NULL; /* oops: no key for some reason */ } @@ -344,8 +343,7 @@ passphrase_get ( u32 *keyid, int mode, const char *cacheid, int repeat, write_status_errcode ("get_passphrase", rc); } - if (pk) - free_public_key( pk ); + free_public_key (pk); if (rc) { xfree (pw); @@ -531,8 +529,7 @@ passphrase_to_dek_ext (u32 *keyid, int pubkey_algo, } tty_printf("\n"); - if (pk) - free_public_key( pk ); + free_public_key (pk); } if ( next_pw ) |