* src/lex.c (parse_percent_token): Be sure to 0-end token_buffer

before returning.
Reported by Benoit Perrot.

diff --git a/ChangeLog b/ChangeLog
index c816b0076b015d724cadbd92262889d4ed4542f8..cb69ee0525af706f86f6e0e665897b7fb073a886 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-03-04  Akim Demaille  <akim@epita.fr>
+
+       * src/lex.c (parse_percent_token): Be sure to 0-end token_buffer
+       before returning.
+       Reported by Benoit Perrot.
+
 2002-03-04  Akim Demaille  <akim@epita.fr>
 
        Use bitset operations when possible, not loops over bits.

diff --git a/THANKS b/THANKS
index c6eef723e6deff6ec5c0cbdf1734bb7f009efe3b..9186c0ffec252004543ecdc9a96e0f8389f2bf39 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -7,6 +7,7 @@ Albert Chin-A-Young     china@thewrittenword.com
 Alexander Belopolsky    alexb@rentec.com
 Andreas Schwab          schwab@suse.de
 Arnold Robbins         arnold@skeeve.com
+Benoit Perrot           benoit.perrot@epita.fr
 Bruce Lilly             blilly@erols.com
 Cris van Pelt           cris@amf03054.office.wxs.nl
 Daniel Hagerty          hag@gnu.org

diff --git a/src/lex.c b/src/lex.c
index 489fdf9c3b62cdec7b11f41f46c441f85f6d06ff..5b77f2485513fe19d7ad6279199e01f81de51f41 100644 (file)
--- a/src/lex.c
+++ b/src/lex.c
@@ -485,44 +485,40 @@ parse_percent_token (void)
   obstack_1grow (&token_obstack, '%');
   obstack_1grow (&token_obstack, c);
 
-  switch (c)
+  if (!isalpha (c))
     {
-    case '%':
+      obstack_1grow (&token_obstack, '\0');
       token_buffer = obstack_finish (&token_obstack);
-      return tok_two_percents;
 
-    case '{':
-      token_buffer = obstack_finish (&token_obstack);
-      return tok_percent_left_curly;
+      switch (c)
+       {
+       case '%':
+         return tok_two_percents;
 
-      /* The following guys are here for backward compatibility with
-        very ancient Yacc versions.  The paper of Johnson mentions
-        them (as ancient :).  */
-    case '<':
-      token_buffer = obstack_finish (&token_obstack);
-      return tok_left;
+       case '{':
+         return tok_percent_left_curly;
 
-    case '>':
-      token_buffer = obstack_finish (&token_obstack);
-      return tok_right;
+         /* The following guys are here for backward compatibility with
+            very ancient Yacc versions.  The paper of Johnson mentions
+            them (as ancient :).  */
+       case '<':
+         return tok_left;
 
-    case '2':
-      token_buffer = obstack_finish (&token_obstack);
-      return tok_nonassoc;
+       case '>':
+         return tok_right;
 
-    case '0':
-      token_buffer = obstack_finish (&token_obstack);
-      return tok_token;
+       case '2':
+         return tok_nonassoc;
 
-    case '=':
-      token_buffer = obstack_finish (&token_obstack);
-      return tok_prec;
-    }
+       case '0':
+         return tok_token;
 
-  if (!isalpha (c))
-    {
-      token_buffer = obstack_finish (&token_obstack);
-      return tok_illegal;
+       case '=':
+         return tok_prec;
+
+       default:
+         return tok_illegal;
+       }
     }
 
   while (c = getc (finput), isalpha (c) || c == '_' || c == '-')