IMAP error checking for bug #662. From Brendan Cully.

diff --git a/imap/imap.c b/imap/imap.c
index 33aa74958aa940bf1171e3dcc712ca821237adf2..d9e5a40e2ff55b48baba9dd568cfc39df3fb9778 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -650,7 +650,12 @@ int imap_open_mailbox (CONTEXT* ctx)
   ctx->hdrs = safe_malloc (count * sizeof (HEADER *));
   ctx->v2r = safe_malloc (count * sizeof (int));
   ctx->msgcount = 0;
-  count = imap_read_headers (idata, 0, count - 1) + 1;
+  if (imap_read_headers (idata, 0, count - 1) < 0)
+  {
+    mutt_error _("Error opening mailbox");
+    mutt_sleep (1);
+    goto fail;
+  }
 
   dprint (2, (debugfile, "imap_open_mailbox: msgcount is %d\n", ctx->msgcount));
   FREE (&mx.mbox);

diff --git a/imap/message.c b/imap/message.c
index c31f1e7131c74488573592959b6969dbf8e8547f..8b6b8cce41fc0586ccdcbae032c77b89730cdb51 100644 (file)
--- a/imap/message.c
+++ b/imap/message.c
@@ -79,7 +79,11 @@ int imap_read_headers (IMAP_DATA* idata, int msgbegin, int msgend)
    * as they come in. */
   mutt_mktemp (tempfile);
   if (!(fp = safe_fopen (tempfile, "w+")))
+  {
+    mutt_error (_("Could not create temporary file %s"), tempfile);
+    mutt_sleep (2);
     return -1;
+  }
   unlink (tempfile);
 
   /* make sure context has room to hold the mailbox */