[svn] GnuPG - r4505 - in trunk: agent g10 sm tools

svn author marcus cvs at cvs.gnupg.org
Sat May 19 00:59:31 CEST 2007


Author: marcus
Date: 2007-05-19 00:58:59 +0200 (Sat, 19 May 2007)
New Revision: 4505

Modified:
   trunk/agent/ChangeLog
   trunk/agent/protect-tool.c
   trunk/g10/ChangeLog
   trunk/g10/passphrase.c
   trunk/sm/ChangeLog
   trunk/sm/certdump.c
   trunk/sm/qualified.c
   trunk/tools/ChangeLog
   trunk/tools/symcryptrun.c
Log:
agent/
2007-05-19  Marcus Brinkmann  <marcus at g10code.de>

	* protect-tool.c (get_passphrase): Free ORIG_CODESET on error.

g10/
2007-05-19  Marcus Brinkmann  <marcus at g10code.de>

	* passphrase.c (passphrase_get): Free ORIG_CODESET on error.

sm/
2007-05-18  Marcus Brinkmann  <marcus at 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 at g10code.de>

	* symcryptrun.c (confucius_get_pass): Free ORIG_CODESET on error.


Modified: trunk/agent/ChangeLog
===================================================================
--- trunk/agent/ChangeLog	2007-05-16 11:10:07 UTC (rev 4504)
+++ trunk/agent/ChangeLog	2007-05-18 22:58:59 UTC (rev 4505)
@@ -1,3 +1,7 @@
+2007-05-19  Marcus Brinkmann  <marcus at g10code.de>
+
+	* protect-tool.c (get_passphrase): Free ORIG_CODESET on error.
+
 2007-05-14  Werner Koch  <wk at g10code.com>
 
 	* protect.c (make_shadow_info): Replace sprintf by smklen.

Modified: trunk/agent/protect-tool.c
===================================================================
--- trunk/agent/protect-tool.c	2007-05-16 11:10:07 UTC (rev 4504)
+++ trunk/agent/protect-tool.c	2007-05-18 22:58:59 UTC (rev 4505)
@@ -1183,7 +1183,10 @@
       /* 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
 

Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2007-05-16 11:10:07 UTC (rev 4504)
+++ trunk/g10/ChangeLog	2007-05-18 22:58:59 UTC (rev 4505)
@@ -1,3 +1,7 @@
+2007-05-19  Marcus Brinkmann  <marcus at g10code.de>
+
+	* passphrase.c (passphrase_get): Free ORIG_CODESET on error.
+
 2007-05-16  Werner Koch  <wk at g10code.com>
 
 	* sig-check.c (check_backsig): Check the digest algorithm before

Modified: trunk/g10/passphrase.c
===================================================================
--- trunk/g10/passphrase.c	2007-05-16 11:10:07 UTC (rev 4504)
+++ trunk/g10/passphrase.c	2007-05-18 22:58:59 UTC (rev 4505)
@@ -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 @@
   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
 

Modified: trunk/sm/ChangeLog
===================================================================
--- trunk/sm/ChangeLog	2007-05-16 11:10:07 UTC (rev 4504)
+++ trunk/sm/ChangeLog	2007-05-18 22:58:59 UTC (rev 4505)
@@ -1,3 +1,9 @@
+2007-05-18  Marcus Brinkmann  <marcus at g10code.de>
+
+	* qualified.c (gpgsm_qualified_consent,
+	gpgsm_not_qualified_warning): Free ORIG_CODESET on error.
+	* certdump.c (gpgsm_format_keydesc): Likewise.
+
 2007-05-07  Werner Koch  <wk at g10code.com>
 
 	* certcheck.c (MY_GCRY_PK_ECDSA): New.

Modified: trunk/sm/certdump.c
===================================================================
--- trunk/sm/certdump.c	2007-05-16 11:10:07 UTC (rev 4504)
+++ trunk/sm/certdump.c	2007-05-18 22:58:59 UTC (rev 4505)
@@ -921,7 +921,10 @@
          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
 
@@ -938,9 +941,11 @@
 
 #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);
 
   if (rc < 0)
     {

Modified: trunk/sm/qualified.c
===================================================================
--- trunk/sm/qualified.c	2007-05-16 11:10:07 UTC (rev 4504)
+++ trunk/sm/qualified.c	2007-05-18 22:58:59 UTC (rev 4505)
@@ -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 @@
          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 @@
          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 @@
 
 #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)

Modified: trunk/tools/ChangeLog
===================================================================
--- trunk/tools/ChangeLog	2007-05-16 11:10:07 UTC (rev 4504)
+++ trunk/tools/ChangeLog	2007-05-18 22:58:59 UTC (rev 4505)
@@ -1,3 +1,7 @@
+2007-05-19  Marcus Brinkmann  <marcus at g10code.de>
+
+	* symcryptrun.c (confucius_get_pass): Free ORIG_CODESET on error.
+
 2007-05-08  Werner Koch  <wk at g10code.com>
 
 	* sockprox.c: New.  It needs to be build manually. By Moritz

Modified: trunk/tools/symcryptrun.c
===================================================================
--- trunk/tools/symcryptrun.c	2007-05-16 11:10:07 UTC (rev 4504)
+++ trunk/tools/symcryptrun.c	2007-05-18 22:58:59 UTC (rev 4505)
@@ -1,5 +1,5 @@
 /* symcryptrun.c - Tool to call simple symmetric encryption tools.
- *	Copyright (C) 2005 Free Software Foundation, Inc.
+ *	Copyright (C) 2005, 2007 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -460,7 +460,10 @@
       /* 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
 




More information about the Gnupg-commits mailing list