Changeset 4889:6e189f8d56ca for commands.c

Timestamp:

2006-12-07 03:34:34 (2 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

- my_mbtowcs didn't recover from bad multibyte sequences

- mutt_format_string was called under the assumption that this

function can operate in-place. Unfortunately, that assumption
only holds if replacement_char() returns a one-byte character.

Files:

• commands.c (modified) (3 diffs)

commands.c

@@ -238 +238 @@
 {
   char prompt[SHORT_STRING];
+  char scratch[SHORT_STRING];
   char buf[HUGE_STRING] = { 0 };
   ADDRESS *adr = NULL;
@@ -279 +280 @@
 
 #define extra_space (15 + 7 + 2)
-  snprintf (prompt, sizeof (prompt),
+  snprintf (scratch, sizeof (scratch),
            (h ? _("Bounce message to %s") : _("Bounce messages to %s")), buf);
 
@@ -286 +287 @@
     mutt_format_string (prompt, sizeof (prompt),
                         0, COLS-extra_space, 0, 0,
-                        prompt, sizeof (prompt), 0);
+                        scratch, sizeof (scratch), 0);
     safe_strcat (prompt, sizeof (prompt), "...?");
   }
   else
-    safe_strcat (prompt, sizeof (prompt), "?");
+    snprintf (prompt, sizeof (prompt), "%s?", scratch);
 
   if (query_quadoption (OPT_BOUNCE, prompt) != M_YES)