* editfns.c (Fformat): Likewise.

diff --git a/src/ChangeLog b/src/ChangeLog
index be3925c088eac37ac50f7f01c55bd19aece50c5e..9e2538c58515a5a5b28f65572e7707c90e958f4c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -4,6 +4,7 @@
        and to avoid potential problems with integer overflow.
        * chartab.c (sub_char_table_set_range, char_table_set_range): Likewise.
        * casetab.c (set_identity, shuffle): Likewise.
+       * editfns.c (Fformat): Likewise.
 
        * xmenu.c (set_frame_menubar): Allocate smaller local vectors.
        This also lets GCC 4.6.0 generate slightly better loop code.

diff --git a/src/editfns.c b/src/editfns.c
index cd424f277bf167fa31bce41d2974338c63a3acfe..e754a074ba8575947bc79ee0880d1ce8a0aa1131 100644 (file)
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3674,7 +3674,7 @@ usage: (format STRING &rest OBJECTS)  */)
     if (!info)
       info = (struct info *) alloca (nbytes);
     memset (info, 0, nbytes);
-    for (i = 0; i <= nargs; i++)
+    for (i = 0; i < nargs + 1; i++)
       info[i].start = -1;
     if (!discarded)
       SAFE_ALLOCA (discarded, char *, SBYTES (args[0]));