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

#6733 segmentation fault (invalid code) in Tokenizer::simplifyAddBracesPair 

Avoid access to NULL-token by throwing an InternalError
This commit is contained in:
amai2012 2015-06-01 13:27:32 +02:00
parent 6857dbe864
commit b81e82d462
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/tokenize.cpp
View File

@ -4503,7 +4503,10 @@ Token *Tokenizer::simplifyAddBracesPair(Token *tok, bool commandWithCondition)
tokAfterCondition->previous()->insertToken("{"); tokAfterCondition->previous()->insertToken("{");
Token * tokOpenBrace = tokAfterCondition->previous(); Token * tokOpenBrace = tokAfterCondition->previous();
Token * tokEnd = tokAfterCondition->linkAt(1)->linkAt(2)->linkAt(1); Token * tokEnd = tokAfterCondition->linkAt(1)->linkAt(2)->linkAt(1);
if (!tokEnd) {
syntaxError(tokAfterCondition);
return nullptr;
}
tokEnd->insertToken("}"); tokEnd->insertToken("}");
Token * tokCloseBrace = tokEnd->next(); Token * tokCloseBrace = tokEnd->next();

5
test/testgarbage.cpp
View File

@ -95,6 +95,7 @@ private:
TEST_CASE(garbageCode54); // #6722 TEST_CASE(garbageCode54); // #6722
TEST_CASE(garbageCode55); // #6724 TEST_CASE(garbageCode55); // #6724
TEST_CASE(garbageCode56); // #6713 TEST_CASE(garbageCode56); // #6713
TEST_CASE(garbageCode57); // #6733
TEST_CASE(garbageValueFlow); TEST_CASE(garbageValueFlow);
TEST_CASE(garbageSymbolDatabase); TEST_CASE(garbageSymbolDatabase);
@ -540,6 +541,10 @@ private:
checkCode("void foo() { int a = 0; int b = ???; }"); checkCode("void foo() { int a = 0; int b = ???; }");
} }
void garbageCode57() { // #6731
ASSERT_THROW(checkCode("{ } if () try { } catch (...) B::~B { }"), InternalError);
}
void garbageValueFlow() { void garbageValueFlow() {
// #6089 // #6089
const char* code = "{} int foo(struct, x1, struct x2, x3, int, x5, x6, x7)\n" const char* code = "{} int foo(struct, x1, struct x2, x3, int, x5, x6, x7)\n"