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/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog
index 248a1d1b61b4fad5b14cb798b55fec581aa6c526..9ca13c91df6f83523fd007ad67bdfc7a9952328c 100644 (file)
--- a/trunk/gpgme/ChangeLog
+++ b/trunk/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/trunk/gpgme/rungpg.c b/trunk/gpgme/rungpg.c
index 7cb4ae79f2a28360cee39d53c7df8c4b298a76d5..fd5e6c129ebf75143c007545cce73f70901d7571 100644 (file)
--- a/trunk/gpgme/rungpg.c
+++ b/trunk/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);