Make imap_hcache_open robust against missing idata->ctx

diff --git a/ChangeLog b/ChangeLog
index 0541c2ea844b30f5e38653ab76aebcd5e53c374c..5f20190a09aa8bbb1952c013a708f47420e8ed79 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,13 @@
-2007-04-10 19:28 -0700  Brendan Cully  <brendan@kublai.com>  (d12143e1a610)
+2007-04-11 07:37 -0700  Brendan Cully  <brendan@kublai.com>  (29faa739ed01)
+
+       * imap/util.c: Do not attempt to parse idata->ctx->path if an explicit
+       path is given
+
+2007-04-10 20:22 -0700  Brendan Cully  <brendan@kublai.com>  (429fb67340cd)
+
+       * UPDATING, imap/imap.c, imap/imap_private.h, imap/message.c,
+       init.h, mutt.h: Add $message_cache_clean option to prune message
+       cache on sync
 
        * hcache.c: Try to unlink old header cache if open fails
 

diff --git a/imap/util.c b/imap/util.c
index cd3b3e788196654efe339191ddeb854abb38a2e3..785d8f3b097e8c950fab7d3ca53c37e79464e341 100644 (file)
--- a/imap/util.c
+++ b/imap/util.c
@@ -87,7 +87,7 @@ header_cache_t* imap_hcache_open (IMAP_DATA* idata, const char* path)
     imap_cachepath (idata, path, mbox, sizeof (mbox));
   else
   {
-    if (imap_parse_path (idata->ctx->path, &mx) < 0)
+    if (!idata->ctx || imap_parse_path (idata->ctx->path, &mx) < 0)
       return NULL;
 
     imap_cachepath (idata, mx.mbox, mbox, sizeof (mbox));