Fix #3129

diff --git a/ChangeLog b/ChangeLog
index 7c006c7795a98e3108b92cc83c7b7bcd186e6248..0061de0bf0634f6c21a13d86a605b8514c3b4449 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-20 09:48 -0700  Brendan Cully  <brendan@kublai.com>  (f119005f8169)
+
+       * imap/imap.c, imap/imap_private.h: Call imap_free_idata instead of
+       freeing directly in imap_logout
+
+       * imap/browse.c: Fix memory leak in imap_mailbox_state
+
 2008-10-19 16:26 -0700  TAKAHASHI Tamotsu  <tamo@momonga-linux.org>  (e1fc907b2968)
 
        * imap/browse.c: Fix up destination path when renaming mailbox. Closes

diff --git a/imap/util.c b/imap/util.c
index 6312b8611e25143c3091b1a2ccf69e35aa61583b..ed05356f1f6ae771d59f4c0be295844570b73517 100644 (file)
--- a/imap/util.c
+++ b/imap/util.c
@@ -407,7 +407,8 @@ char *imap_fix_path (IMAP_DATA *idata, char *mailbox, char *path,
   {
     if (strchr(ImapDelimChars, *mailbox) || *mailbox == delim)
     {
-      while (strchr(ImapDelimChars, *mailbox) || *mailbox == delim)
+      while (*mailbox &&
+            (strchr(ImapDelimChars, *mailbox) || *mailbox == delim))
         mailbox++;
       path[i] = delim;
     }