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

Fixed crash on garbage code (#7074)

This commit is contained in:
PKEuS 2015-10-26 13:29:47 +01:00
parent 34ec1112a9
commit 636bf75799
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/token.cpp
View File

@ -1158,7 +1158,7 @@ bool Token::isUnaryPreOp() const
return true; return true;
const Token *tokbefore = _previous; const Token *tokbefore = _previous;
const Token *tokafter = _next; const Token *tokafter = _next;
for (int distance = 1; distance < 10; distance++) { for (int distance = 1; distance < 10 && tokbefore; distance++) {
if (tokbefore == _astOperand1) if (tokbefore == _astOperand1)
return false; return false;
if (tokafter == _astOperand1) if (tokafter == _astOperand1)

5
test/testgarbage.cpp
View File

@ -193,6 +193,7 @@ private:
TEST_CASE(garbageCode142); // #7050 TEST_CASE(garbageCode142); // #7050
TEST_CASE(garbageCode143); // #6922 TEST_CASE(garbageCode143); // #6922
TEST_CASE(garbageCode144); // #6865 TEST_CASE(garbageCode144); // #6865
TEST_CASE(garbageCode145); // #7074
TEST_CASE(garbageValueFlow); TEST_CASE(garbageValueFlow);
TEST_CASE(garbageSymbolDatabase); TEST_CASE(garbageSymbolDatabase);
@ -1138,6 +1139,10 @@ private:
//ASSERT_THROW(checkCode("template < typename > struct A { } ; template < typename > struct A < INVALID > : A < int[ > { }] ;"), InternalError); //ASSERT_THROW(checkCode("template < typename > struct A { } ; template < typename > struct A < INVALID > : A < int[ > { }] ;"), InternalError);
} }
void garbageCode145() { // #7074
checkCode("++4++ + + E++++++++++ + ch " "tp.oed5[.]");
}
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"