fix regressions

[apps/madmutt.git] / imap / command.c

diff --git a/imap/command.c b/imap/command.c
index 49e4441..1232457 100644 (file)
--- a/imap/command.c
+++ b/imap/command.c
@@ -16,6 +16,8 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+
 #include "lib/mem.h"
 #include "lib/intl.h"
 #include "lib/debug.h"
@@ -42,7 +44,7 @@ static void cmd_parse_fetch (IMAP_DATA * idata, char *s);
 static void cmd_parse_myrights (IMAP_DATA * idata, char *s);
 static void cmd_parse_search (IMAP_DATA* idata, char* s);
 
-static char *Capabilities[] = {
+static const char *Capabilities[] = {
   "IMAP4",
   "IMAP4rev1",
   "STATUS",
@@ -74,12 +76,12 @@ int imap_cmd_start (IMAP_DATA * idata, const char *cmd)
   cmd_make_sequence (idata);
   /* seq, space, cmd, \r\n\0 */
   outlen = str_len (idata->cmd.seq) + str_len (cmd) + 4;
-  out = (char *) mem_malloc (outlen);
+  out = p_new(char, outlen);
   snprintf (out, outlen, "%s %s\r\n", idata->cmd.seq, cmd);
 
   rc = mutt_socket_write (idata->conn, out);
 
-  mem_free (&out);
+  p_delete(&out);
 
   return (rc < 0) ? IMAP_CMD_BAD : 0;
 }
@@ -188,13 +190,13 @@ int imap_exec (IMAP_DATA * idata, const char *cmd, int flags)
   cmd_make_sequence (idata);
   /* seq, space, cmd, \r\n\0 */
   outlen = str_len (idata->cmd.seq) + str_len (cmd) + 4;
-  out = (char *) mem_malloc (outlen);
+  out = p_new(char, outlen);
   snprintf (out, outlen, "%s %s\r\n", idata->cmd.seq, cmd);
 
   rc = mutt_socket_write_d (idata->conn, out,
                             flags & IMAP_CMD_PASS ? IMAP_LOG_PASS :
                             IMAP_LOG_CMD);
-  mem_free (&out);
+  p_delete(&out);
 
   if (rc < 0) {
     cmd_handle_fatal (idata);
@@ -432,7 +434,7 @@ static void cmd_parse_capabilities (IMAP_DATA * idata, char *s)
   debug_print (2, ("Handling CAPABILITY\n"));
 
   s = imap_next_word (s);
-  mem_free (&idata->capstr);
+  p_delete(&idata->capstr);
   idata->capstr = str_dup (s);
 
   memset (idata->capabilities, 0, sizeof (idata->capabilities));
@@ -492,6 +494,9 @@ static void cmd_parse_fetch (IMAP_DATA * idata, char *s)
     for (cur = 0; cur < idata->ctx->msgcount; cur++) {
       h = idata->ctx->hdrs[cur];
 
+      if (!h)
+        break;
+
       if (h->active && h->index + 1 == msgno) {
         debug_print (2, ("Message UID %d updated\n", HEADER_DATA (h)->uid));
         break;
@@ -577,7 +582,7 @@ static void cmd_parse_lsub (IMAP_DATA* idata, char* s) {
     err.dsize = sizeof (errstr);
     if (mutt_parse_rc_line (buf, &token, &err))
       debug_print (1, ("Error adding subscribed mailbox: %s\n", errstr));
-    mem_free (&token.data);
+    p_delete(&token.data);
   }
   else
     debug_print (1, ("Bad LSUB response\n"));