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. --- g10/ChangeLog | 4 ++++ g10/passphrase.c | 9 ++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'g10') diff --git a/g10/ChangeLog b/g10/ChangeLog index 93fe77d2b..a6b6cb5b3 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,7 @@ +2007-05-19 Marcus Brinkmann + + * passphrase.c (passphrase_get): Free ORIG_CODESET on error. + 2007-05-16 Werner Koch * sig-check.c (check_backsig): Check the digest algorithm before 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 -- cgit v1.2.3