[Gpa-commits] r996 - trunk/src

[scm-commit@wald.intevation.org]

Author: moritzs
Date: 2009-05-16 14:55:07 +0200 (Sat, 16 May 2009)
New Revision: 996

Modified:
   trunk/src/ChangeLog
   trunk/src/cardman.c
Log:
2009-05-16  Moritz  <moritz at gnu.org>

	* cardman.c (gpa_card_manager_finalize): Check for
	cardman->gpgagent being non-NULL before passing it to
	gpgme_release.



Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2009-05-14 09:25:51 UTC (rev 995)
+++ trunk/src/ChangeLog	2009-05-16 12:55:07 UTC (rev 996)
@@ -1,3 +1,9 @@
+2009-05-16  Moritz  <moritz at gnu.org>
+
+	* cardman.c (gpa_card_manager_finalize): Check for
+	cardman->gpgagent being non-NULL before passing it to
+	gpgme_release.
+
 2009-05-14  Werner Koch  <wk at g10code.com>
 
 	* cm-openpgp.c (struct _GpaCMOpenpgp): Add field KEY_ATTRIBUTES.

Modified: trunk/src/cardman.c
===================================================================
--- trunk/src/cardman.c	2009-05-14 09:25:51 UTC (rev 995)
+++ trunk/src/cardman.c	2009-05-16 12:55:07 UTC (rev 996)
@@ -999,8 +999,11 @@
 {  
   GpaCardManager *cardman = GPA_CARD_MANAGER (object);
 
-  gpgme_release (cardman->gpgagent);
-  cardman->gpgagent = NULL;
+  if (cardman->gpgagent)
+    {
+      gpgme_release (cardman->gpgagent);
+      cardman->gpgagent = NULL;
+    }
   
   if (cardman->ticker_timeout_id)
     {