merge from trunk

2 files changed, 6 insertions, 0 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 4e3f3424c91..35190fd2a8f 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-31  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * etags.c (consider_token): Always zero-terminate token buffer.
+        (Bug#12306)
+
 2012-08-19  Paul Eggert  <eggert@cs.ucla.edu>
 
         Rely on <config.h> + <unistd.h> to declare 'environ'.
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 9c03735c954..e65082de534 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -2878,6 +2878,7 @@ consider_token (register char *str, register int len, register int c, int *c_ext
            objdef = omethodtag;
            linebuffer_setlen (&token_name, oldlen + len);
            memcpy (token_name.buffer + oldlen, str, len);
+           token_name.buffer[oldlen + len] = '\0';
            return TRUE;
          }
        return FALSE;