aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camel/ChangeLog5
-rw-r--r--camel/camel-pgp-context.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index f6ed0d6133..0c2660c426 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,5 +1,10 @@
2001-10-18 Jeffrey Stedfast <fejj@ximian.com>
+ * camel-pgp-context.c (crypto_exec_with_passwd): Make sure the
+ cancel_fd isn't -1.
+
+2001-10-18 Jeffrey Stedfast <fejj@ximian.com>
+
* providers/imap/camel-imap-message-cache.c (insert_finish): Flush
the stream here, not sure it really matters but it might
(hopefully) fix bug #12943.
diff --git a/camel/camel-pgp-context.c b/camel/camel-pgp-context.c
index 5f159999a6..79a53fd633 100644
--- a/camel/camel-pgp-context.c
+++ b/camel/camel-pgp-context.c
@@ -411,7 +411,7 @@ crypto_exec_with_passwd (const char *path, char *argv[], const char *input, int
select_result = select (max + 1, &fdset, &write_fdset,
NULL, &timeout);
- if (FD_ISSET (cancel_fd, &fdset)) {
+ if (cancel_fd != -1 && FD_ISSET (cancel_fd, &fdset)) {
/* user-cancelled */
break;
}