Catch mutt_buffer_printf failures.

diff --git a/imap/command.c b/imap/command.c
index 2c409c2baa7625a1639f88eaf5311e71f157579a..093cab07be5889eedf19f2c3d753af6a895be7d2 100644 (file)
--- a/imap/command.c
+++ b/imap/command.c
@@ -81,8 +81,9 @@ int imap_cmd_queue (IMAP_DATA* idata, const char* cmdstr)
   if (!(cmd = cmd_new (idata)))
     return IMAP_CMD_BAD;
 
-  mutt_buffer_printf (idata->cmdbuf, "%s%s %s\r\n",
-    idata->state == IMAP_IDLE ? "DONE\r\n" : "", cmd->seq, cmdstr);
+  if (mutt_buffer_printf (idata->cmdbuf, "%s%s %s\r\n",
+      idata->state == IMAP_IDLE ? "DONE\r\n" : "", cmd->seq, cmdstr) < 0)
+    return IMAP_CMD_BAD;
 
   if (idata->state == IMAP_IDLE)
     idata->state = IMAP_SELECTED;

diff --git a/muttlib.c b/muttlib.c
index de8ec4f0215435fb17257be1e3240ae0fa80dbfa..1a4eee27b6b7551928bb8b2f962e375da0e1431d 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -1440,7 +1440,8 @@ int mutt_buffer_printf (BUFFER* buf, const char* fmt, ...)
     len = vsnprintf (buf->dptr, len, fmt, ap_retry);
     va_end (ap_retry);
   }
-  buf->dptr += len;
+  if (len > 0)
+    buf->dptr += len;
 
   va_end (ap);