2 files changed, 6 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 31943170b94..c827ba7c53a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-19  Kim F. Storm  <storm@cua.dk>
+
+        * editfns.c (Fformat): Don't scan past end of format string that
+        ends in %.  Reported by: Johan Bockg,Ae(Brd.
+
 2005-09-18  Andreas Schwab  <schwab@suse.de>
 
         * window.h (struct window): Remove height_fixed_p, no longer set.
diff --git a/src/editfns.c b/src/editfns.c
index dfb6f865dfb..3f33285bcfc 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3556,7 +3556,7 @@ usage: (format STRING &rest OBJECTS)  */)
            digits to print after the '.' for floats, or the max.
            number of chars to print from a string.  */
 
-        while (index ("-0# ", *format))
+        while (*format && index ("-0# ", *format))
           ++format;
 
         if (*format >= '0' && *format <= '9')