diff options
| author | Marcus Brinkmann <mb@g10code.com> | 2007-05-19 00:58:59 +0200 |
|---|---|---|
| committer | Marcus Brinkmann <mb@g10code.com> | 2007-05-19 00:58:59 +0200 |
| commit | b9042f1cecce76e9a174013f3def0bc7aa640cc3 (patch) | |
| tree | 396666250d6889f135ea97c15b6097e4877527c9 /sm/qualified.c | |
| parent | Fix for bug 797. (diff) | |
| download | gnupg2-b9042f1cecce76e9a174013f3def0bc7aa640cc3.tar.xz gnupg2-b9042f1cecce76e9a174013f3def0bc7aa640cc3.zip | |
agent/
2007-05-19 Marcus Brinkmann <marcus@g10code.de>
* protect-tool.c (get_passphrase): Free ORIG_CODESET on error.
g10/
2007-05-19 Marcus Brinkmann <marcus@g10code.de>
* passphrase.c (passphrase_get): Free ORIG_CODESET on error.
sm/
2007-05-18 Marcus Brinkmann <marcus@g10code.de>
* 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 <marcus@g10code.de>
* symcryptrun.c (confucius_get_pass): Free ORIG_CODESET on error.
Diffstat (limited to 'sm/qualified.c')
| -rw-r--r-- | sm/qualified.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/sm/qualified.c b/sm/qualified.c index 920d15f4a..4a9c81ddb 100644 --- a/sm/qualified.c +++ b/sm/qualified.c @@ -1,5 +1,5 @@ /* qualified.c - Routines related to qualified signatures - * Copyright (C) 2005 Free Software Foundation, Inc. + * Copyright (C) 2005, 2007 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -216,7 +216,10 @@ gpgsm_qualified_consent (ctrl_t ctrl, ksba_cert_t cert) bother printing a diagnostic here. */ orig_codeset = xstrdup (orig_codeset); if (!bind_textdomain_codeset (PACKAGE_GT, "utf-8")) - orig_codeset = NULL; + { + xfree (orig_codeset); + orig_codeset = NULL; + } } #endif @@ -313,7 +316,10 @@ gpgsm_not_qualified_warning (ctrl_t ctrl, ksba_cert_t cert) bother printing a diagnostic here. */ orig_codeset = xstrdup (orig_codeset); if (!bind_textdomain_codeset (PACKAGE_GT, "utf-8")) - orig_codeset = NULL; + { + xfree (orig_codeset); + orig_codeset = NULL; + } } #endif @@ -330,9 +336,11 @@ gpgsm_not_qualified_warning (ctrl_t ctrl, ksba_cert_t cert) #ifdef ENABLE_NLS if (orig_codeset) - bind_textdomain_codeset (PACKAGE_GT, orig_codeset); + { + bind_textdomain_codeset (PACKAGE_GT, orig_codeset); + xfree (orig_codeset); + } #endif - xfree (orig_codeset); xfree (subject); if (err) |