diff options
author | Werner Koch <[email protected]> | 2009-06-09 18:59:45 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2009-06-09 18:59:45 +0000 |
commit | 4d70cf8e409f58b42f590c72d2ec2b929cddb924 (patch) | |
tree | 5f2b5f7cf548b8f59b7b8fbb555ec19bf52f08de | |
parent | Add gpgme_io_write and gpgme_io_read. (diff) | |
download | gpgme-4d70cf8e409f58b42f590c72d2ec2b929cddb924.tar.gz gpgme-4d70cf8e409f58b42f590c72d2ec2b929cddb924.zip |
Fix possible assert in the card edit.
-rw-r--r-- | trunk/src/ChangeLog | 2 | ||||
-rw-r--r-- | trunk/src/engine-gpg.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/trunk/src/ChangeLog b/trunk/src/ChangeLog index 7f67b02c..3e03da5d 100644 --- a/trunk/src/ChangeLog +++ b/trunk/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/trunk/src/engine-gpg.c b/trunk/src/engine-gpg.c index 606b4d76..34bd613d 100644 --- a/trunk/src/engine-gpg.c +++ b/trunk/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; |