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

Fixed #3618 (segmentation fault of cppcheck)

This commit is contained in:
August Sodora 2012-06-12 21:07:17 +02:00 committed by Daniel Marjamäki
parent 54a66391d8
commit 90f92250dd
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/tokenize.cpp
View File

@ -487,6 +487,9 @@ static Token *processFunc(Token *tok2, bool inOperator)
while (Token::Match(tok2, "%var% ::")) while (Token::Match(tok2, "%var% ::"))
tok2 = tok2->tokAt(2); tok2 = tok2->tokAt(2);
if (!tok2)
return NULL;
if (tok2->str() == "(" && if (tok2->str() == "(" &&
tok2->link()->next()->str() == "(") { tok2->link()->next()->str() == "(") {
tok2 = tok2->link(); tok2 = tok2->link();
@ -1198,6 +1201,9 @@ void Tokenizer::simplifyTypedef()
if (!inCast) if (!inCast)
tok2 = processFunc(tok2, inOperator); tok2 = processFunc(tok2, inOperator);
if (!tok2)
break;
tok2->insertToken(")"); tok2->insertToken(")");
tok2 = tok2->next(); tok2 = tok2->next();
Token::createMutualLinks(tok2, tok3); Token::createMutualLinks(tok2, tok3);

7
test/testtokenize.cpp
View File

@ -61,6 +61,7 @@ private:
TEST_CASE(wrong_syntax1); TEST_CASE(wrong_syntax1);
TEST_CASE(wrong_syntax2); TEST_CASE(wrong_syntax2);
TEST_CASE(wrong_syntax3); // #3544 TEST_CASE(wrong_syntax3); // #3544
TEST_CASE(wrong_syntax4); // #3618
TEST_CASE(wrong_syntax_if_macro); // #2518 - if MACRO() TEST_CASE(wrong_syntax_if_macro); // #2518 - if MACRO()
TEST_CASE(minus); TEST_CASE(minus);
@ -671,6 +672,12 @@ private:
tokenizeAndStringify(code); tokenizeAndStringify(code);
} }
void wrong_syntax4() { // #3618
const char code[] = "typedef void (x) (int); return x&";
tokenizeAndStringify(code);
}
void wrong_syntax_if_macro() { void wrong_syntax_if_macro() {
// #2518 // #2518
const std::string code("void f() { if MACRO(); }"); const std::string code("void f() { if MACRO(); }");