From: Marcus Brinkmann <mb@g10code.com>
Date: Thu, 11 Mar 2004 13:54:27 +0000 (+0000)
Subject: 2004-03-11  Marcus Brinkmann  <marcus@g10code.de>
X-Git-Tag: gpgme-0-4-6~14
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f7e02a469f0ac0235d922973254e770a066fc533;p=gpgme.git

2004-03-11  Marcus Brinkmann  <marcus@g10code.de>

	* rungpg.c (gpg_cancel): Set GPG->fd_data_map to NULL after
	releasing it.
---

diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 248a1d1..9ca13c9 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,5 +1,7 @@
 2004-03-11  Marcus Brinkmann  <marcus@g10code.de>
 
+	* rungpg.c (gpg_cancel): Set GPG->fd_data_map to NULL after
+	releasing it.
 	* engine-gpgsm.c (gpgsm_cancel): Only call assuan_disconnect if
 	GPGSM->assuan_ctx is not NULL.  Set it to NULL afterwards.
 
diff --git a/gpgme/rungpg.c b/gpgme/rungpg.c
index 7cb4ae7..fd5e6c1 100644
--- a/gpgme/rungpg.c
+++ b/gpgme/rungpg.c
@@ -293,7 +293,10 @@ gpg_cancel (void *engine)
   if (gpg->colon.fd[1] != -1)
     _gpgme_io_close (gpg->colon.fd[1]);
   if (gpg->fd_data_map)
-    free_fd_data_map (gpg->fd_data_map);
+    {
+      free_fd_data_map (gpg->fd_data_map);
+      gpg->fd_data_map = NULL;
+    }
   if (gpg->cmd.fd != -1)
     _gpgme_io_close (gpg->cmd.fd);