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

7111 segmentation fault (invalid code) in Tokenizer::simplifyRedundantParentheses

This commit is contained in:
Alexander Mai 2015-11-08 13:45:55 +01:00
parent 4ea9655685
commit ab296fa93f
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tokenize.cpp
View File

@ -6897,7 +6897,7 @@ bool Tokenizer::simplifyRedundantParentheses()
} }
while (Token::simpleMatch(tok, "( (") && while (Token::simpleMatch(tok, "( (") &&
tok->link()->previous() == tok->next()->link()) { tok->link() && tok->link()->previous() == tok->next()->link()) {
// We have "(( *something* ))", remove the inner // We have "(( *something* ))", remove the inner
// parentheses // parentheses
tok->deleteNext(); tok->deleteNext();

5
test/testgarbage.cpp
View File

@ -201,6 +201,7 @@ private:
TEST_CASE(garbageCode150); // #7089 TEST_CASE(garbageCode150); // #7089
TEST_CASE(garbageCode151); // #4175 TEST_CASE(garbageCode151); // #4175
TEST_CASE(garbageCode152); // travis after 9c7271a5 TEST_CASE(garbageCode152); // travis after 9c7271a5
TEST_CASE(garbageCode153);
TEST_CASE(garbageValueFlow); TEST_CASE(garbageValueFlow);
@ -1213,6 +1214,10 @@ private:
checkCode(code); checkCode(code);
} }
void garbageCode153() {
ASSERT_THROW(checkCode("enum { X = << { X } } { X X } enum { X = << { ( X ) } } { } X */"), 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"