From ae6f93814ac620833fe9e7c7684b51a1ef01ea11 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Fri, 19 Oct 2001 00:30:36 +0000 Subject: Make sure the cancel_fd isn't -1. 2001-10-18 Jeffrey Stedfast * camel-pgp-context.c (crypto_exec_with_passwd): Make sure the cancel_fd isn't -1. svn path=/trunk/; revision=13781 --- camel/ChangeLog | 5 +++++ camel/camel-pgp-context.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'camel') diff --git a/camel/ChangeLog b/camel/ChangeLog index f6ed0d6133..0c2660c426 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,8 @@ +2001-10-18 Jeffrey Stedfast + + * camel-pgp-context.c (crypto_exec_with_passwd): Make sure the + cancel_fd isn't -1. + 2001-10-18 Jeffrey Stedfast * providers/imap/camel-imap-message-cache.c (insert_finish): Flush 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; } -- cgit v1.2.3