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

fix #3003 (segmentation fault of cppcheck (typedef a x[]; y = x ))

Browse Source
This commit is contained in:
Robert Reif 2011-08-14 20:38:16 -04:00
parent b7f42535ec
commit 08e9d64a86
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/tokenize.cpp
View File

@ -1977,6 +1977,12 @@ void Tokenizer::simplifyTypedef()
{ {
do do
{ {
if (!tok2->next())
{
syntaxError(tok2);
return; // can't recover so quit
}
if (!inCast && !inSizeof) if (!inCast && !inSizeof)
tok2 = tok2->next(); tok2 = tok2->next();

9
test/testsimplifytokens.cpp
View File

@ -266,6 +266,7 @@ private:
TEST_CASE(simplifyTypedef98); // ticket #2963 TEST_CASE(simplifyTypedef98); // ticket #2963
TEST_CASE(simplifyTypedef99); // ticket #2999 TEST_CASE(simplifyTypedef99); // ticket #2999
TEST_CASE(simplifyTypedef100); // ticket #3000 TEST_CASE(simplifyTypedef100); // ticket #3000
TEST_CASE(simplifyTypedef101); // ticket #3003 (segmentation fault)
TEST_CASE(simplifyTypedefFunction1); TEST_CASE(simplifyTypedefFunction1);
TEST_CASE(simplifyTypedefFunction2); // ticket #1685 TEST_CASE(simplifyTypedefFunction2); // ticket #1685
@ -5384,6 +5385,14 @@ private:
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
} }
void simplifyTypedef101() // ticket #3003 (segmentation fault)
{
const char code[] = "typedef a x[];\n"
"y = x\n";
sizeof_(code);
ASSERT_EQUALS("[test.cpp:2]: (error) syntax error\n", errout.str());
}
void simplifyTypedefFunction1() void simplifyTypedefFunction1()
{ {
{ {