From cc95528267653020ce9ceb0ddb24dd501c0264f8 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Sat, 29 Nov 2008 12:21:10 +0000 Subject: [PATCH] lex.c (cpp_token_len): Use 6 as default length. libcpp: * lex.c (cpp_token_len): Use 6 as default length. gcc/testsuite: * g++.dg/cpp/stringop-1.C: New test. From-SVN: r142275 --- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/g++.dg/cpp/stringop-1.C | 29 +++++++++++++++++++++++++++ libcpp/ChangeLog | 4 ++++ libcpp/lex.c | 2 +- 4 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/cpp/stringop-1.C diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 707a9591d515..a8710407905a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2008-11-29 Joseph Myers + + * g++.dg/cpp/stringop-1.C: New test. + 2008-11-29 Eric Botcazou * gnat.dg/test_version.adb: Adjust to new string length. diff --git a/gcc/testsuite/g++.dg/cpp/stringop-1.C b/gcc/testsuite/g++.dg/cpp/stringop-1.C new file mode 100644 index 000000000000..071a1009c381 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp/stringop-1.C @@ -0,0 +1,29 @@ +/* Test for buffer overrun stringizing named operators longer than 4 + characters. */ +/* { dg-do compile } */ + +#define str(x) #x +#define var(v,a,b,c,d) static const char v##a##b##c##d[] = str(xor_eq) +#define var1(v,a,b,c) \ + var(v,a,b,c,0); var(v,a,b,c,1); var(v,a,b,c,2); var(v,a,b,c,3); \ + var(v,a,b,c,4); var(v,a,b,c,5); var(v,a,b,c,6); var(v,a,b,c,7); \ + var(v,a,b,c,8); var(v,a,b,c,9) +#define var2(v,a,b) \ + var1(v,a,b,0); var1(v,a,b,1); var1(v,a,b,2); var1(v,a,b,3); \ + var1(v,a,b,4); var1(v,a,b,5); var1(v,a,b,6); var1(v,a,b,7); \ + var1(v,a,b,8); var1(v,a,b,9) +#define var3(v,a) \ + var2(v,a,0); var2(v,a,1); var2(v,a,2); var2(v,a,3); \ + var2(v,a,4); var2(v,a,5); var2(v,a,6); var2(v,a,7); \ + var2(v,a,8); var2(v,a,9) + +var3(v,0); +var3(v,1); +var3(v,2); +var3(v,3); +var3(v,4); +var3(v,5); +var3(v,6); +var3(v,7); +var3(v,8); +var3(v,9); diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 1d0d28c7b4eb..9f6148edc139 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,7 @@ +2008-11-29 Joseph Myers + + * lex.c (cpp_token_len): Use 6 as default length. + 2008-10-31 Manuel López-Ibáñez * expr.c (struct op): Add location. diff --git a/libcpp/lex.c b/libcpp/lex.c index 57364f00bb98..96d1a99e283e 100644 --- a/libcpp/lex.c +++ b/libcpp/lex.c @@ -1362,7 +1362,7 @@ cpp_token_len (const cpp_token *token) switch (TOKEN_SPELL (token)) { - default: len = 4; break; + default: len = 6; break; case SPELL_LITERAL: len = token->val.str.len; break; case SPELL_IDENT: len = NODE_LEN (token->val.node) * 10; break; }