[Emacs-diffs] /srv/bzr/emacs/trunk r109832: Fixes: debbugs:12306

[Andreas Schwab]

------------------------------------------------------------
revno: 109832
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Fri 2012-08-31 18:53:48 +0200
message:
  Fixes: debbugs:12306
  
  * etags.c (consider_token): Always zero-terminate token buffer.
modified:
  lib-src/ChangeLog
  lib-src/etags.c

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2012-08-28 16:01:59 +0000
+++ b/lib-src/ChangeLog 2012-08-31 16:53:48 +0000
@@ -1,3 +1,8 @@
+2012-08-31  Andreas Schwab  <address@hidden>
+
+       * etags.c (consider_token): Always zero-terminate token buffer.
+       (Bug#12306)
+
 2012-08-19  Paul Eggert  <address@hidden>
 
        Rely on <config.h> + <unistd.h> to declare 'environ'.

=== modified file 'lib-src/etags.c'
--- a/lib-src/etags.c   2012-08-15 08:57:14 +0000
+++ b/lib-src/etags.c   2012-08-31 16:53:48 +0000
@@ -2878,6 +2878,7 @@
           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;