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

Ticket #8255: Don't crash upon invalid code while checking conditions.

This commit is contained in:
Simon Martin 2017-10-28 07:39:35 +02:00
parent 883da93b21
commit cbf0b13b3e
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tokenize.cpp
View File

@ -8310,6 +8310,8 @@ const Token * Tokenizer::findGarbageCode() const
for (const Token *tok = tokens(); tok; tok = tok->next()) { for (const Token *tok = tokens(); tok; tok = tok->next()) {
if (Token::Match(tok, "%cop% %or%|%oror%|/|%")) if (Token::Match(tok, "%cop% %or%|%oror%|/|%"))
return tok; return tok;
if (Token::Match(tok, ";|(|[ %comp%"))
return tok;
} }
// Code must not start with an arithmetical operand // Code must not start with an arithmetical operand

19
test/testgarbage.cpp
View File

@ -218,6 +218,7 @@ private:
TEST_CASE(garbageCode185); // #6011 TEST_CASE(garbageCode185); // #6011
TEST_CASE(garbageCode186); // #8151 TEST_CASE(garbageCode186); // #8151
TEST_CASE(garbageCode187); TEST_CASE(garbageCode187);
TEST_CASE(garbageCode188);
TEST_CASE(garbageValueFlow); TEST_CASE(garbageValueFlow);
TEST_CASE(garbageSymbolDatabase); TEST_CASE(garbageSymbolDatabase);
TEST_CASE(garbageAST); TEST_CASE(garbageAST);
@ -562,12 +563,12 @@ private:
} }
void garbageCode36() { // #6334 void garbageCode36() { // #6334
checkCode("{ } < class template < > , { = } ; class... >\n" ASSERT_THROW(checkCode("{ } < class template < > , { = } ; class... >\n"
"struct Y { }\n" "struct Y { }\n"
"class Types { }\n" "class Types { }\n"
"( X < int > \"uses template\" ) ( < ( ) \"uses ;" "( X < int > \"uses template\" ) ( < ( ) \"uses ;"
"( int int ::primary \"uses template\" ) int double \"uses )" "( int int ::primary \"uses template\" ) int double \"uses )"
"::primary , \"uses template\" ;\n"); "::primary , \"uses template\" ;\n"), InternalError);
} }
void garbageCode37() { void garbageCode37() {
@ -710,7 +711,7 @@ private:
} }
void garbageCode77() { // #6755 void garbageCode77() { // #6755
checkCode("void foo (int **p) { { { };>= } } unsigned *d = (b b--) --*d"); ASSERT_THROW(checkCode("void foo (int **p) { { { };>= } } unsigned *d = (b b--) --*d"), InternalError);
} }
void garbageCode78() { // #6756 void garbageCode78() { // #6756
@ -823,7 +824,7 @@ private:
} }
void garbageCode105() { // #6859 void garbageCode105() { // #6859
checkCode("void foo (int i) { int a , for (a 1; a( < 4; a++) if (a) (b b++) (b);) n++; }"); ASSERT_THROW(checkCode("void foo (int i) { int a , for (a 1; a( < 4; a++) if (a) (b b++) (b);) n++; }"), InternalError);
} }
void garbageCode106() { // #6880 void garbageCode106() { // #6880
@ -843,7 +844,7 @@ private:
} }
void garbageCode110() { // #6902 "segmentation fault (invalid code) in CheckStl::string_c_str" void garbageCode110() { // #6902 "segmentation fault (invalid code) in CheckStl::string_c_str"
checkCode("( *const<> ( size_t ) ; foo ) { } * ( *const ( size_t ) ( ) ;> foo )< { }"); ASSERT_THROW(checkCode("( *const<> ( size_t ) ; foo ) { } * ( *const ( size_t ) ( ) ;> foo )< { }"), InternalError);
} }
void garbageCode111() { // #6907 void garbageCode111() { // #6907
@ -866,7 +867,7 @@ private:
} }
void garbageCode116() { // #5356 void garbageCode116() { // #5356
checkCode("struct template<int { = }; > struct B { }; B < 0 > b;"); ASSERT_THROW(checkCode("struct template<int { = }; > struct B { }; B < 0 > b;"), InternalError);
} }
void garbageCode117() { // #6121 void garbageCode117() { // #6121
@ -1097,7 +1098,7 @@ private:
} }
void garbageCode144() { // #6865 void garbageCode144() { // #6865
checkCode("template < typename > struct A { } ; template < typename > struct A < INVALID > : A < int[ > { }] ;"); ASSERT_THROW(checkCode("template < typename > struct A { } ; template < typename > struct A < INVALID > : A < int[ > { }] ;"), InternalError);
} }
void garbageCode146() { // #7081 void garbageCode146() { // #7081
@ -1432,6 +1433,10 @@ private:
ASSERT_THROW(checkCode(inp), InternalError); ASSERT_THROW(checkCode(inp), InternalError);
} }
void garbageCode188() { // #8255
ASSERT_THROW(checkCode("{z r(){(){for(;<(x);){if(0==0)}}}}"), InternalError);
}
void syntaxErrorFirstToken() { void syntaxErrorFirstToken() {
ASSERT_THROW(checkCode("&operator(){[]};"), InternalError); // #7818 ASSERT_THROW(checkCode("&operator(){[]};"), InternalError); // #7818
ASSERT_THROW(checkCode("*(*const<> (size_t); foo) { } *(*const (size_t)() ; foo) { }"), InternalError); // #6858 ASSERT_THROW(checkCode("*(*const<> (size_t); foo) { } *(*const (size_t)() ; foo) { }"), InternalError); // #6858