[svn] gpgme - r1253 - trunk/gpgme

[svn author marcus]

Author: marcus
Date: 2007-09-13 22:42:04 +0200 (Thu, 13 Sep 2007)
New Revision: 1253

Modified:
   trunk/gpgme/ChangeLog
   trunk/gpgme/rungpg.c
Log:
2007-09-13  Marcus Brinkmann  <marcus at g10code.de>

	* rungpg.c (gpg_new): Handle return value of _gpgme_getenv (fixes
	small memory leak).


Modified: trunk/gpgme/ChangeLog
===================================================================
--- trunk/gpgme/ChangeLog	2007-09-07 20:54:12 UTC (rev 1252)
+++ trunk/gpgme/ChangeLog	2007-09-13 20:42:04 UTC (rev 1253)
@@ -1,3 +1,8 @@
+2007-09-13  Marcus Brinkmann  <marcus at g10code.de>
+
+	* rungpg.c (gpg_new): Handle return value of _gpgme_getenv (fixes
+	small memory leak).
+
 2007-09-07  Marcus Brinkmann  <marcus at g10code.de>
 
 	* Makefile.am (libgpgme_qt_la_SOURCES): Move

Modified: trunk/gpgme/rungpg.c
===================================================================
--- trunk/gpgme/rungpg.c	2007-09-07 20:54:12 UTC (rev 1252)
+++ trunk/gpgme/rungpg.c	2007-09-13 20:42:04 UTC (rev 1253)
@@ -463,6 +463,8 @@
     goto leave;
 
   rc = _gpgme_getenv ("DISPLAY", &dft_display);
+  if (rc)
+    goto leave;
   if (dft_display)
     {
       rc = add_arg (gpg, "--display");
@@ -471,8 +473,6 @@
 
       free (dft_display);
     }
-  if (rc)
-    goto leave;
 
   if (isatty (1))
     {
@@ -489,7 +489,7 @@
 	  if (!rc)
 	    {
 	      rc = _gpgme_getenv ("TERM", &dft_ttytype);
-	      if (!rc)
+	      if (rc)
 		goto leave;
 
 	      rc = add_arg (gpg, "--ttytype");