diff options
| author | Moritz Schulte <[email protected]> | 2004-12-05 15:36:49 +0000 |
|---|---|---|
| committer | Moritz Schulte <[email protected]> | 2004-12-05 15:36:49 +0000 |
| commit | 14524a8e79a08c829f5ae991aa49b9ffca5acd1d (patch) | |
| tree | 15edb575d8459db6a8dac6b7051d304787a03635 | |
| parent | post release version number updates (diff) | |
| download | gnupg-14524a8e79a08c829f5ae991aa49b9ffca5acd1d.tar.gz gnupg-14524a8e79a08c829f5ae991aa49b9ffca5acd1d.zip | |
2004-12-05 Moritz Schulte <[email protected]>
* query.c (start_pinentry): Allow CTRL be NULL.
| -rw-r--r-- | agent/ChangeLog | 4 | ||||
| -rw-r--r-- | agent/query.c | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog index 756711f1a..e0bf52b45 100644 --- a/agent/ChangeLog +++ b/agent/ChangeLog @@ -1,3 +1,7 @@ +2004-12-05 Moritz Schulte <[email protected]> + + * query.c (start_pinentry): Allow CTRL be NULL. + 2004-10-22 Werner Koch <[email protected]> * gpg-agent.c (parse_rereadable_options): Return "not handled" diff --git a/agent/query.c b/agent/query.c index b514f6f5e..cdf6ff259 100644 --- a/agent/query.c +++ b/agent/query.c @@ -152,7 +152,7 @@ start_pinentry (CTRL ctrl) pgmname++; argv[0] = pgmname; - if (ctrl->display && !opt.keep_display) + if (ctrl && ctrl->display && !opt.keep_display) { argv[1] = "--display"; argv[2] = ctrl->display; @@ -189,7 +189,7 @@ start_pinentry (CTRL ctrl) NULL, NULL, NULL, NULL, NULL, NULL); if (rc) return unlock_pinentry (map_assuan_err (rc)); - if (ctrl->ttyname) + if (ctrl && ctrl->ttyname) { char *optstr; if (asprintf (&optstr, "OPTION ttyname=%s", ctrl->ttyname) < 0 ) @@ -200,7 +200,7 @@ start_pinentry (CTRL ctrl) if (rc) return unlock_pinentry (map_assuan_err (rc)); } - if (ctrl->ttytype) + if (ctrl && ctrl->ttytype) { char *optstr; if (asprintf (&optstr, "OPTION ttytype=%s", ctrl->ttytype) < 0 ) @@ -210,7 +210,7 @@ start_pinentry (CTRL ctrl) if (rc) return unlock_pinentry (map_assuan_err (rc)); } - if (ctrl->lc_ctype) + if (ctrl && ctrl->lc_ctype) { char *optstr; if (asprintf (&optstr, "OPTION lc-ctype=%s", ctrl->lc_ctype) < 0 ) @@ -220,7 +220,7 @@ start_pinentry (CTRL ctrl) if (rc) return unlock_pinentry (map_assuan_err (rc)); } - if (ctrl->lc_messages) + if (ctrl && ctrl->lc_messages) { char *optstr; if (asprintf (&optstr, "OPTION lc-messages=%s", ctrl->lc_messages) < 0 ) |