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

Merge pull request #600 from simartin/ticket_6704 

Ticket #6704: Tighten pattern skipping base class declarations and fix crash upon garbage code
This commit is contained in:
orbitcowboy 2015-05-24 09:27:45 +02:00
parent af8d258d11 26f244e638
commit dfb015a7e3
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tokenize.cpp
View File

@ -2792,7 +2792,7 @@ void Tokenizer::setVarId()
const Token* tokStart = tok->tokAt(2);
while (tokStart && tokStart->str() != "{") {
if (Token::Match(tokStart, "public|private|protected"))
if (Token::Match(tokStart, "public|private|protected %name%"))
tokStart = tokStart->next();
if (tokStart->strAt(1) == "," || tokStart->strAt(1) == "{")
varlist[classname].insert(varlist[tokStart->str()].begin(), varlist[tokStart->str()].end());

5
test/testgarbage.cpp
View File

@ -82,6 +82,7 @@ private:
TEST_CASE(garbageCode41); // #6685
TEST_CASE(garbageCode42); // #5760
TEST_CASE(garbageCode43); // #6703
TEST_CASE(garbageCode44); // #6704
TEST_CASE(garbageValueFlow);
TEST_CASE(garbageSymbolDatabase);
@ -475,6 +476,10 @@ private:
checkCode("int { }; struct A<void> a = { }");
}
void garbageCode44() { // #6704
ASSERT_THROW(checkCode("{ { }; }; { class A : }; public typedef b;"), InternalError);
}
void garbageValueFlow() {
// #6089
const char* code = "{} int foo(struct, x1, struct x2, x3, int, x5, x6, x7)\n"