2004-03-11 Marcus Brinkmann <marcus@g10code.de>
* rungpg.c (gpg_cancel): Set GPG->fd_data_map to NULL after releasing it.
This commit is contained in:
parent
dcb04fb195
commit
f7e02a469f
@ -1,5 +1,7 @@
|
|||||||
2004-03-11 Marcus Brinkmann <marcus@g10code.de>
|
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
|
* engine-gpgsm.c (gpgsm_cancel): Only call assuan_disconnect if
|
||||||
GPGSM->assuan_ctx is not NULL. Set it to NULL afterwards.
|
GPGSM->assuan_ctx is not NULL. Set it to NULL afterwards.
|
||||||
|
|
||||||
|
@ -293,7 +293,10 @@ gpg_cancel (void *engine)
|
|||||||
if (gpg->colon.fd[1] != -1)
|
if (gpg->colon.fd[1] != -1)
|
||||||
_gpgme_io_close (gpg->colon.fd[1]);
|
_gpgme_io_close (gpg->colon.fd[1]);
|
||||||
if (gpg->fd_data_map)
|
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)
|
if (gpg->cmd.fd != -1)
|
||||||
_gpgme_io_close (gpg->cmd.fd);
|
_gpgme_io_close (gpg->cmd.fd);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user