diff options
| author | Marcus Brinkmann <[email protected]> | 2007-05-18 22:58:59 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2007-05-18 22:58:59 +0000 |
| commit | b9042f1cecce76e9a174013f3def0bc7aa640cc3 (patch) | |
| tree | 396666250d6889f135ea97c15b6097e4877527c9 /g10/passphrase.c | |
| parent | Fix for bug 797. (diff) | |
| download | gnupg-b9042f1cecce76e9a174013f3def0bc7aa640cc3.tar.gz gnupg-b9042f1cecce76e9a174013f3def0bc7aa640cc3.zip | |
agent/
2007-05-19 Marcus Brinkmann <[email protected]>
* protect-tool.c (get_passphrase): Free ORIG_CODESET on error.
g10/
2007-05-19 Marcus Brinkmann <[email protected]>
* passphrase.c (passphrase_get): Free ORIG_CODESET on error.
sm/
2007-05-18 Marcus Brinkmann <[email protected]>
* 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 <[email protected]>
* symcryptrun.c (confucius_get_pass): Free ORIG_CODESET on error.
Diffstat (limited to '')
| -rw-r--r-- | g10/passphrase.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/g10/passphrase.c b/g10/passphrase.c index 122b251dd..83606b8ff 100644 --- a/g10/passphrase.c +++ b/g10/passphrase.c @@ -1,6 +1,6 @@ /* passphrase.c - Get a passphrase * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, - * 2005, 2006 Free Software Foundation, Inc. + * 2005, 2006, 2007 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -289,8 +289,11 @@ passphrase_get ( u32 *keyid, int mode, const char *cacheid, if (orig_codeset) { /* We only switch when we are able to restore the codeset later. */ orig_codeset = xstrdup (orig_codeset); - if (!bind_textdomain_codeset (PACKAGE, "utf-8")) - orig_codeset = NULL; + if (!bind_textdomain_codeset (PACKAGE_GT, "utf-8")) + { + xfree (orig_codeset); + orig_codeset = NULL; + } } #endif |