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

Fixed #4300 (segmentation fault of cppcheck (invalid code))

This commit is contained in:
Daniel Marjamäki 2013-02-20 06:58:27 +01:00
parent 34c3697750
commit 71b66209b7
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tokenize.cpp
View File

@ -3752,7 +3752,7 @@ void Tokenizer::simplifyEmptyNamespaces()
return; return;
bool goback = false; bool goback = false;
for (Token *tok = list.front(); tok; tok = tok->next()) { for (Token *tok = list.front(); tok; tok = tok ? tok->next() : NULL) {
if (goback) { if (goback) {
tok = tok->previous(); tok = tok->previous();
goback = false; goback = false;

9
test/testtokenize.cpp
View File

@ -68,7 +68,8 @@ private:
TEST_CASE(wrong_syntax4); // #3618 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(syntax_case_default); TEST_CASE(syntax_case_default);
TEST_CASE(garbageCode); TEST_CASE(garbageCode1);
TEST_CASE(garbageCode2); // #4300
TEST_CASE(foreach); // #3690 TEST_CASE(foreach); // #3690
@ -835,10 +836,14 @@ private:
} }
} }
void garbageCode() { void garbageCode1() {
tokenizeAndStringify("struct x foo_t; foo_t typedef y;"); tokenizeAndStringify("struct x foo_t; foo_t typedef y;");
} }
void garbageCode2() { //#4300 (segmentation fault)
tokenizeAndStringify("enum { D = 1 struct { } ; } s.b = D;");
}
void foreach() { void foreach() {
// #3690 // #3690
const std::string code("void f() { for each ( char c in MyString ) { Console::Write(c); } }"); const std::string code("void f() { for each ( char c in MyString ) { Console::Write(c); } }");