Changeset 5073:efbcef81ac49

Timestamp:

2007-04-05 17:33:47 (20 months ago)

Author:

Brendan Cully <brendan@…>

Branch:

HEAD

Message:

Keep hcache pointer in idata, open and close with mailbox

Files:

• ChangeLog (modified) (1 diff)
• imap/imap.c (modified) (10 diffs)
• imap/imap_private.h (modified) (3 diffs)
• imap/message.c (modified) (8 diffs)
• imap/util.c (modified) (1 diff)

ChangeLog

@@ -1 @@
-2007-04-05 15:21 -0700  Brendan Cully  <brendan@kublai.com>  (7cf4415ec23d)
+2007-04-05 17:07 -0700  Brendan Cully  <brendan@kublai.com>  (26b19fc9b78c)
+
+        * hcache.c: Do not cache some unsafe header fields.
+
+        * imap/message.c, mh.c: Small hcache-related memory leaks
+
+        * hcache.c, mh.c: Fix mh header caching (closes #2472)
 
         * configure.ac: Teach --with-gdbm to accept a prefix (closes #2413)

imap/imap.c

@@ -250 +250 @@
 
 #if USE_HCACHE
-  header_cache_t *hc;
   char uidbuf[32];
-
-  hc = imap_hcache_open (idata, idata->ctx->path);
 #endif
 
@@ -269 +266 @@
       imap_cache_del (idata, h);
 #if USE_HCACHE
-      if (hc)
+      if (idata->hcache)
       {
         sprintf (uidbuf, "/%u", HEADER_DATA(h)->uid);
-        mutt_hcache_delete (hc, uidbuf, imap_hcache_keylen);
+        mutt_hcache_delete (idata->hcache, uidbuf, imap_hcache_keylen);
       }
 #endif
@@ -288 +285 @@
     }
   }
-
-#if USE_HCACHE
-  mutt_hcache_close (hc);
-#endif
 
   /* We may be called on to expunge at any time. We can't rely on the caller
@@ -750 +743 @@
   ctx->v2r = safe_calloc (count, sizeof (int));
   ctx->msgcount = 0;
+#ifdef USE_HCACHE
+  idata->hcache = imap_hcache_open (idata, idata->ctx->path);
+#endif
   if (count && (imap_read_headers (idata, 0, count-1) < 0))
   {
@@ -762 +758 @@
 
  fail:
+#ifdef USE_HCACHE
+  mutt_hcache_close (idata->hcache);
+#endif
   if (idata->state == IMAP_SELECTED)
     idata->state = IMAP_AUTHENTICATED;
@@ -1109 +1108 @@
   int rc;
 #if USE_HCACHE
-  void* hc = NULL;
   char uidbuf[32];
 #endif
@@ -1156 +1154 @@
   }
 
-#if USE_HCACHE
-  if (expunge && ctx->closing)
-    hc = imap_hcache_open (idata, idata->ctx->path);
-#endif
-
   /* save messages with real (non-flag) changes */
   for (n = 0; n < ctx->msgcount; n++)
@@ -1169 +1162 @@
       imap_cache_del (idata, h);
 #if USE_HCACHE
-    if (hc && h->deleted)
+    if (idata->hcache && h->deleted)
     {
       sprintf (uidbuf, "/%u", HEADER_DATA(h)->uid);
-      mutt_hcache_delete (hc, uidbuf, imap_hcache_keylen);
+      mutt_hcache_delete (idata->hcache, uidbuf, imap_hcache_keylen);
     }
 #endif
@@ -1272 +1265 @@
   rc = 0;
  out:
-#if USE_HCACHE
-  mutt_hcache_close (hc);
-#endif
   if (cmd.data)
     FREE (&cmd.data);
@@ -1333 +1323 @@
   }
 
+#ifdef USE_HCACHE
+  mutt_hcache_close (idata->hcache);
+#endif
   mutt_bcache_close (&idata->bcache);
 

imap/imap_private.h

@@ -25 +25 @@
 #include "mutt_socket.h"
 #include "bcache.h"
+#ifdef USE_HCACHE
+#include "hcache.h"
+#endif
 
 /* -- symbols -- */
@@ -209 +212 @@
   /* all folder flags - system flags AND keywords */
   LIST *flags;
+#ifdef USE_HCACHE
+  header_cache_t *hcache;
+#endif
 } IMAP_DATA;
 /* I wish that were called IMAP_CONTEXT :( */
@@ -254 +260 @@
 /* util.c */
 #ifdef USE_HCACHE
-void* imap_hcache_open (IMAP_DATA* idata, const char* path);
+header_cache_t* imap_hcache_open (IMAP_DATA* idata, const char* path);
 #endif
 

imap/message.c

@@ -76 +76 @@
 
 #if USE_HCACHE
-  header_cache_t *hc = NULL;
   unsigned int *uid_validity = NULL;
   unsigned int *uidnext = NULL;
@@ -122 +121 @@
 
 #if USE_HCACHE
-  if (!msgbegin)
-    hc = imap_hcache_open (idata, ctx->path);
-
-  if (hc)
-  {
-    uid_validity = mutt_hcache_fetch_raw (hc, "/UIDVALIDITY", imap_hcache_keylen);
-    uidnext = mutt_hcache_fetch_raw (hc, "/UIDNEXT", imap_hcache_keylen);
+  if (idata->hcache)
+  {
+    uid_validity = mutt_hcache_fetch_raw (idata->hcache, "/UIDVALIDITY", imap_hcache_keylen);
+    uidnext = mutt_hcache_fetch_raw (idata->hcache, "/UIDNEXT", imap_hcache_keylen);
     if (uid_validity && uidnext && *uid_validity == idata->uid_validity
         && *uidnext > 0)
@@ -174 +170 @@
         idx = h.sid - 1;
         sprintf(uid_buf, "/%u", h.data->uid); /* XXX --tg 21:41 04-07-11 */
-        uid_validity = (unsigned int*)mutt_hcache_fetch (hc, uid_buf, &imap_hcache_keylen);
+        uid_validity = (unsigned int*)mutt_hcache_fetch (idata->hcache, uid_buf, &imap_hcache_keylen);
 
         if (uid_validity != NULL && *uid_validity == idata->uid_validity)
@@ -210 +206 @@
           imap_free_header_data ((void**) &h.data);
         fclose (fp);
-        mutt_hcache_close (hc);
         return -1;
       }
@@ -300 +295 @@
 #if USE_HCACHE
       sprintf(uid_buf, "/%u", h.data->uid);
-      mutt_hcache_store(hc, uid_buf, ctx->hdrs[idx], idata->uid_validity, &imap_hcache_keylen);
+      mutt_hcache_store(idata->hcache, uid_buf, ctx->hdrs[idx], idata->uid_validity, &imap_hcache_keylen);
 #endif /* USE_HCACHE */
 
@@ -313 +308 @@
         imap_free_header_data ((void**) &h.data);
       fclose (fp);
-#if USE_HCACHE
-      mutt_hcache_close (hc);
-#endif /* USE_HCACHE */
       return -1;
     }
@@ -334 +326 @@
 
 #if USE_HCACHE
-  mutt_hcache_store_raw (hc, "/UIDVALIDITY", &idata->uid_validity,
+  mutt_hcache_store_raw (idata->hcache, "/UIDVALIDITY", &idata->uid_validity,
                          sizeof (idata->uid_validity), imap_hcache_keylen);
   if (maxuid && idata->uidnext < maxuid + 1)
@@ -342 +334 @@
   }
   if (idata->uidnext > 1)
-    mutt_hcache_store_raw (hc, "/UIDNEXT", &idata->uidnext,
+    mutt_hcache_store_raw (idata->hcache, "/UIDNEXT", &idata->uidnext,
                            sizeof (idata->uidnext), imap_hcache_keylen);
-  mutt_hcache_close (hc);
 #endif /* USE_HCACHE */
 

imap/util.c

@@ -71 +71 @@
 
 #ifdef USE_HCACHE
-void* imap_hcache_open (IMAP_DATA* idata, const char* path)
+header_cache_t* imap_hcache_open (IMAP_DATA* idata, const char* path)
 {
   IMAP_MBOX mx;