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

Allow NULL for free_public_key.

Browse source
This commit is contained in:
Werner Koch 2011-09-20 19:24:52 +02:00
parent 850f09b2e3
commit 6cf8890dc1
8 changed files with 36 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

9
g10/passphrase.c
View file

@ -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 )