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

Merge pull request #456 from simartin/ticket_6817_take2 

Ticket #6187: Avoid infinite loop if eraseDeadCode does not remove anything (this time without memory corruption).
This commit is contained in:
Daniel Marjamäki 2014-10-23 09:43:02 +02:00
parent 4483c3e820 c6e2107d99
commit 6088ba7951
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/tokenize.cpp
View File

@ -8967,10 +8967,13 @@ void Tokenizer::simplifyWhile0()
// remove "while (0) { .. }" // remove "while (0) { .. }"
if (Token::simpleMatch(tok->next()->link(), ") {")) { if (Token::simpleMatch(tok->next()->link(), ") {")) {
Token *end = tok->next()->link(); Token *end = tok->next()->link(), *old_prev = tok->previous();
end = end->next()->link(); end = end->next()->link();
tok = tok->previous(); eraseDeadCode(old_prev, end->next());
eraseDeadCode(tok, end->next()); if (old_prev && old_prev->next())
tok = old_prev->next();
else
break;
} }
} }
} }

10
test/testsimplifytokens.cpp
View File

@ -2393,6 +2393,16 @@ private:
ASSERT_EQUALS("void foo ( ) { exit ( 0 ) ; }", ASSERT_EQUALS("void foo ( ) { exit ( 0 ) ; }",
tokWithStdLib("void foo() { do { exit(0); } while (true); }")); tokWithStdLib("void foo() { do { exit(0); } while (true); }"));
// #6187
tokWithStdLib("void foo() {\n"
" goto label;\n"
" for (int i = 0; i < 0; ++i) {\n"
" ;\n"
"label:\n"
" ;\n"
" }\n"
"}");
} }
void strcat1() { void strcat1() {