From 5bf647499a5f6d08ac8aa4809ebce22acf1330b3 Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@linux-m68k.org>
Date: Fri, 31 Aug 2012 18:53:48 +0200
Subject: [PATCH] Fixes: debbugs:12306

* etags.c (consider_token): Always zero-terminate token buffer.
---
 lib-src/ChangeLog | 5 +++++
 lib-src/etags.c   | 1 +
 2 files changed, 6 insertions(+)

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 4e3f3424c9..35190fd2a8 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 9c03735c95..e65082de53 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;
-- 
2.39.2