From f7e02a469f0ac0235d922973254e770a066fc533 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Thu, 11 Mar 2004 13:54:27 +0000 Subject: [PATCH] 2004-03-11 Marcus Brinkmann * rungpg.c (gpg_cancel): Set GPG->fd_data_map to NULL after releasing it. --- gpgme/ChangeLog | 2 ++ gpgme/rungpg.c | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) 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 + * 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);