aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Brinkmann <[email protected]>2004-03-11 13:54:27 +0000
committerMarcus Brinkmann <[email protected]>2004-03-11 13:54:27 +0000
commitf7e02a469f0ac0235d922973254e770a066fc533 (patch)
treed22ed9eb70ef4dcf61bc0a22674feed4a633aeb4
parent2004-03-11 Marcus Brinkmann <[email protected]> (diff)
downloadgpgme-f7e02a469f0ac0235d922973254e770a066fc533.tar.gz
gpgme-f7e02a469f0ac0235d922973254e770a066fc533.zip
2004-03-11 Marcus Brinkmann <[email protected]>
* rungpg.c (gpg_cancel): Set GPG->fd_data_map to NULL after releasing it.
-rw-r--r--gpgme/ChangeLog2
-rw-r--r--gpgme/rungpg.c5
2 files changed, 6 insertions, 1 deletions
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 248a1d1b..9ca13c91 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,5 +1,7 @@
2004-03-11 Marcus Brinkmann <[email protected]>
+ * 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 7cb4ae79..fd5e6c12 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);