aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2009-06-09 18:59:45 +0000
committerWerner Koch <[email protected]>2009-06-09 18:59:45 +0000
commitf4e35be32534c99e0168dfd6620565cfa387957e (patch)
treeba9fd33e5b0bf257596f8df43f5d7c2a6831491e
parentAdd gpgme_io_write and gpgme_io_read. (diff)
downloadgpgme-f4e35be32534c99e0168dfd6620565cfa387957e.tar.gz
gpgme-f4e35be32534c99e0168dfd6620565cfa387957e.zip
Fix possible assert in the card edit.
-rw-r--r--src/ChangeLog2
-rw-r--r--src/engine-gpg.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7f67b02c..3e03da5d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
2009-06-09 Werner Koch <[email protected]>
+ * engine-gpg.c (gpg_io_event): Test for cmd.fd.
+
* version.c (gpgme_check_version_internal): Make result const.
* gpgme.c: Include priv-io.h.
diff --git a/src/engine-gpg.c b/src/engine-gpg.c
index 606b4d76..34bd613d 100644
--- a/src/engine-gpg.c
+++ b/src/engine-gpg.c
@@ -171,6 +171,8 @@ close_notify_handler (int fd, void *opaque)
}
else if (gpg->colon.fd[1] == fd)
gpg->colon.fd[1] = -1;
+ else if (gpg->cmd.fd == fd)
+ gpg->cmd.fd = -1;
else if (gpg->fd_data_map)
{
int i;