X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=imap%2Fcommand.c;h=ba9d66631cdc610c5216d7a6c2aff6087cccccfe;hb=2c522cac0278dd774896f25048da2c5cc1d9cf99;hp=0a52ca4b0e2513b427c009b232d8034e8292cf22;hpb=814a01519c9605d479201b99eb16c97b0ad8635d;p=apps%2Fmadmutt.git

diff --git a/imap/command.c b/imap/command.c
index 0a52ca4..ba9d666 100644
--- a/imap/command.c
+++ b/imap/command.c
@@ -70,7 +70,7 @@ int imap_cmd_start (IMAP_DATA * idata, const char *cmd)
 
   cmd_make_sequence (idata);
   /* seq, space, cmd, \r\n\0 */
-  outlen = safe_strlen (idata->cmd.seq) + safe_strlen (cmd) + 4;
+  outlen = mutt_strlen (idata->cmd.seq) + mutt_strlen (cmd) + 4;
   out = (char *) safe_malloc (outlen);
   snprintf (out, outlen, "%s %s\r\n", idata->cmd.seq, cmd);
 
@@ -168,6 +168,12 @@ int imap_exec (IMAP_DATA * idata, const char *cmd, int flags)
   int outlen;
   int rc;
 
+  if (!idata) {
+    mutt_error (_("No mailbox is open."));
+    mutt_sleep (1);
+    return (-1);
+  }
+
   if (idata->status == IMAP_FATAL) {
     cmd_handle_fatal (idata);
     return -1;
@@ -176,7 +182,7 @@ int imap_exec (IMAP_DATA * idata, const char *cmd, int flags)
   /* create sequence for command */
   cmd_make_sequence (idata);
   /* seq, space, cmd, \r\n\0 */
-  outlen = safe_strlen (idata->cmd.seq) + safe_strlen (cmd) + 4;
+  outlen = mutt_strlen (idata->cmd.seq) + mutt_strlen (cmd) + 4;
   out = (char *) safe_malloc (outlen);
   snprintf (out, outlen, "%s %s\r\n", idata->cmd.seq, cmd);