walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

fix #2736 (segmentation fault of cppcheck)

This commit is contained in:
Robert Reif 2011-04-20 07:49:04 -04:00
parent 46afc54c10
commit b1d3d291e6
2 changed files with 104 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/tokenize.cpp
View File

@ -1479,7 +1479,8 @@ void Tokenizer::simplifyTypedef()
// check for entering a new namespace // check for entering a new namespace
else if (Token::Match(tok2, "namespace %any% {")) else if (Token::Match(tok2, "namespace %any% {"))
{ {
if (spaceInfo[classLevel].isNamespace && if (classLevel < spaceInfo.size() &&
spaceInfo[classLevel].isNamespace &&
spaceInfo[classLevel].className == tok2->next()->str()) spaceInfo[classLevel].className == tok2->next()->str())
{ {
classLevel++; classLevel++;

116
test/testsimplifytokens.cpp
View File

@ -255,6 +255,7 @@ private:
TEST_CASE(simplifyTypedef89); // ticket #2717 TEST_CASE(simplifyTypedef89); // ticket #2717
TEST_CASE(simplifyTypedef90); // ticket #2718 TEST_CASE(simplifyTypedef90); // ticket #2718
TEST_CASE(simplifyTypedef91); // ticket #2716 TEST_CASE(simplifyTypedef91); // ticket #2716
TEST_CASE(simplifyTypedef92); // ticket #2736
TEST_CASE(simplifyTypedefFunction1); TEST_CASE(simplifyTypedefFunction1);
TEST_CASE(simplifyTypedefFunction2); // ticket #1685 TEST_CASE(simplifyTypedefFunction2); // ticket #1685
@ -5115,23 +5116,110 @@ private:
void simplifyTypedef91() // ticket #2716 void simplifyTypedef91() // ticket #2716
{ {
const char code[] = "namespace NS {\n" const char code1[] = "namespace NS {\n"
" typedef int (*T)();\n" " typedef int (*T)();\n"
" class A {\n" " class A {\n"
" T f();\n" " T f();\n"
" };\n" " };\n"
"}\n" "}\n"
"namespace NS {\n"
" T A::f() {}\n"
"}\n";
const char expected1[] = "namespace NS { "
"; "
"class A { "
"int ( * f ( ) ) ( ) ; "
"} ; "
"} "
"namespace NS { "
"int ( * A :: f ( ) ) ( ) { } "
"}";
checkSimplifyTypedef(code1);
ASSERT_EQUALS(expected1, sizeof_(code1));
ASSERT_EQUALS("", errout.str());
const char code2[] = "namespace NS {\n"
" typedef int (*T)();\n"
" class A {\n"
" T f();\n"
" };\n"
"}\n"
"NS::T NS::A::f() {}\n";
const char expected2[] = "namespace NS { "
"; "
"class A { "
"int ( * f ( ) ) ( ) ; "
"} ; "
"} "
"int ( * NS :: A :: f ( ) ) ( ) { }";
checkSimplifyTypedef(code2);
ASSERT_EQUALS(expected2, sizeof_(code2));
ASSERT_EQUALS("", errout.str());
const char code3[] = "namespace NS1 {\n"
" namespace NS2 {\n"
" typedef int (*T)();\n"
" class A {\n"
" T f();\n"
" };\n"
" }\n"
"}\n"
"namespace NS1 {\n"
" namespace NS2 {\n"
" T A::f() {}\n"
" }\n"
"}\n";
const char expected3[] = "namespace NS1 { "
"namespace NS2 { "
"; "
"class A { "
"int ( * f ( ) ) ( ) ; "
"} ; "
"} "
"} "
"namespace NS1 { "
"namespace NS2 { "
"int ( * A :: f ( ) ) ( ) { } "
"} "
"}";
checkSimplifyTypedef(code3);
ASSERT_EQUALS(expected3, sizeof_(code3));
ASSERT_EQUALS("", errout.str());
const char code4[] = "namespace NS1 {\n"
" namespace NS2 {\n"
" typedef int (*T)();\n"
" class A {\n"
" T f();\n"
" };\n"
" }\n"
"}\n"
"namespace NS1 {\n"
" NS2::T NS2::A::f() {}\n"
"}\n";
const char expected4[] = "namespace NS1 { "
"namespace NS2 { "
"; "
"class A { "
"int ( * f ( ) ) ( ) ; "
"} ; "
"} "
"} "
"namespace NS1 { "
"int ( * NS2 :: A :: f ( ) ) ( ) { } "
"}";
checkSimplifyTypedef(code4);
ASSERT_EQUALS(expected4, sizeof_(code4));
ASSERT_EQUALS("", errout.str());
}
void simplifyTypedef92() // ticket #2736 (segmentation fault)
{
const char code[] = "typedef long Long;\n"
"namespace NS {\n" "namespace NS {\n"
" T A::f() {}\n"
"}\n"; "}\n";
const char expected[] = "namespace NS { " const char expected[] = "; "
"; "
"class A { "
"int ( * f ( ) ) ( ) ; "
"} ; "
"} "
"namespace NS { " "namespace NS { "
"int ( * A :: f ( ) ) ( ) { } "
"}"; "}";
checkSimplifyTypedef(code); checkSimplifyTypedef(code);