From b9042f1cecce76e9a174013f3def0bc7aa640cc3 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Fri, 18 May 2007 22:58:59 +0000 Subject: agent/ 2007-05-19 Marcus Brinkmann * protect-tool.c (get_passphrase): Free ORIG_CODESET on error. g10/ 2007-05-19 Marcus Brinkmann * passphrase.c (passphrase_get): Free ORIG_CODESET on error. sm/ 2007-05-18 Marcus Brinkmann * qualified.c (gpgsm_qualified_consent, gpgsm_not_qualified_warning): Free ORIG_CODESET on error. * certdump.c (gpgsm_format_keydesc): Likewise. tools/ 2007-05-19 Marcus Brinkmann * symcryptrun.c (confucius_get_pass): Free ORIG_CODESET on error. --- agent/ChangeLog | 4 ++++ agent/protect-tool.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'agent') diff --git a/agent/ChangeLog b/agent/ChangeLog index ce8b874b1..cab775385 100644 --- a/agent/ChangeLog +++ b/agent/ChangeLog @@ -1,3 +1,7 @@ +2007-05-19 Marcus Brinkmann + + * protect-tool.c (get_passphrase): Free ORIG_CODESET on error. + 2007-05-14 Werner Koch * protect.c (make_shadow_info): Replace sprintf by smklen. diff --git a/agent/protect-tool.c b/agent/protect-tool.c index 8496601b5..f7e2d603b 100644 --- a/agent/protect-tool.c +++ b/agent/protect-tool.c @@ -1183,7 +1183,10 @@ get_passphrase (int promptno, int opt_check) /* We only switch when we are able to restore the codeset later. */ orig_codeset = xstrdup (orig_codeset); if (!bind_textdomain_codeset (PACKAGE_GT, "utf-8")) - orig_codeset = NULL; + { + xfree (orig_codeset); + orig_codeset = NULL; + } } #endif -- cgit v1.2.3