diff options
| author | Marcus Brinkmann <[email protected]> | 2004-03-10 23:52:18 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2004-03-10 23:52:18 +0000 |
| commit | dcb04fb19521a507ef5bd49027d528fca969aebe (patch) | |
| tree | 0985a0d0e4f0d30c919b6872765b329142b57253 | |
| parent | Prepare for next round of changes. (diff) | |
| download | gpgme-dcb04fb19521a507ef5bd49027d528fca969aebe.tar.gz gpgme-dcb04fb19521a507ef5bd49027d528fca969aebe.zip | |
2004-03-11 Marcus Brinkmann <[email protected]>
* engine-gpgsm.c (gpgsm_cancel): Only call assuan_disconnect if
GPGSM->assuan_ctx is not NULL. Set it to NULL afterwards.
| -rw-r--r-- | gpgme/ChangeLog | 5 | ||||
| -rw-r--r-- | gpgme/engine-gpgsm.c | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index 38f8f433..248a1d1b 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,3 +1,8 @@ +2004-03-11 Marcus Brinkmann <[email protected]> + + * engine-gpgsm.c (gpgsm_cancel): Only call assuan_disconnect if + GPGSM->assuan_ctx is not NULL. Set it to NULL afterwards. + 2004-03-07 Marcus Brinkmann <[email protected]> * gpgme-config.in: Do not emit include and lib directory for diff --git a/gpgme/engine-gpgsm.c b/gpgme/engine-gpgsm.c index 11011318..bbcdb425 100644 --- a/gpgme/engine-gpgsm.c +++ b/gpgme/engine-gpgsm.c @@ -289,7 +289,11 @@ gpgsm_cancel (void *engine) if (gpgsm->message_cb.fd != -1) _gpgme_io_close (gpgsm->message_cb.fd); - assuan_disconnect (gpgsm->assuan_ctx); + if (gpgsm->assuan_ctx) + { + assuan_disconnect (gpgsm->assuan_ctx); + gpgsm->assuan_ctx = NULL; + } return 0; } |