* editfns.c (Fformat): Fix off-by-1 bug for "%%b" (Bug#9514).

This occurs when processing a multibyte format, which can happen
when using 'eval'.  Problem reported by Wolfgang Jenker.

diff --git a/src/ChangeLog b/src/ChangeLog
index 83dc66a1720dfe4dda369fd883f2e71d78e9b6ff..895e3e587b32b47cb4b66763bb89573dbb474204 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * editfns.c (Fformat): Fix off-by-1 bug for "%%b" (Bug#9514).
+       This occurs when processing a multibyte format, which can happen
+       when using 'eval'.  Problem reported by Wolfgang Jenker.
+
 2011-09-15  Johan Bockgård  <bojohan@gnu.org>
 
        * xdisp.c (try_cursor_movement): Only check for exact match if

diff --git a/src/editfns.c b/src/editfns.c
index 596765d899e6abbd07fd83d1c25d68a097618eab..f62efc30790b7e878256caeb1783f6c3316f6a4a 100644 (file)
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -4137,8 +4137,9 @@ usage: (format STRING &rest OBJECTS)  */)
                format++;
              while (! CHAR_HEAD_P (*format));
 
-             convbytes = format - format0;
-             memset (&discarded[format0 + 1 - format_start], 2, convbytes - 1);
+             convbytes = format - src;
+             memset (&discarded[format0 + 1 - format_start], 2,
+                     format - (format0 + 1));
            }
          else
            {