aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2015-01-27 08:11:13 +0000
committerWerner Koch <[email protected]>2015-01-27 08:11:58 +0000
commit6eebc56687935f3e993eac374b9f4cc5ad3bcf2b (patch)
treeeca966a0317f3d40d31e4b0e47df339ee9b403e3
parentagent: Fix agent_public_key_from_file for ECC. (diff)
downloadgnupg-6eebc56687935f3e993eac374b9f4cc5ad3bcf2b.tar.gz
gnupg-6eebc56687935f3e993eac374b9f4cc5ad3bcf2b.zip
gpg: Fix segv introduced to commit 4d7c9b0.
* g10/keygen.c (get_parameter_passphrase): Take care of R == NULL. Signed-off-by: Werner Koch <[email protected]>
-rw-r--r--g10/keygen.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/keygen.c b/g10/keygen.c
index 614326922..50fb67dce 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -2826,7 +2826,7 @@ static const char *
get_parameter_passphrase (struct para_data_s *para)
{
struct para_data_s *r = get_parameter (para, pPASSPHRASE);
- return r->u.value;
+ return r ? r->u.value : NULL;
}