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

#7050 segmentation fault (invalid code) in isVariableChanged

This commit is contained in:
Alexander Mai 2015-10-15 21:27:55 +02:00
parent 6cf25825de
commit 8e3e981323
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/valueflow.cpp
View File

@ -924,7 +924,7 @@ static void valueFlowBeforeCondition(TokenList *tokenlist, SymbolDatabase *symbo
// Variable changed in 3rd for-expression // Variable changed in 3rd for-expression
if (Token::simpleMatch(tok2->previous(), "for (")) { if (Token::simpleMatch(tok2->previous(), "for (")) {
if (tok2->astOperand2() && isVariableChanged(tok2->astOperand2()->astOperand2(), tok2->link(), varid)) { if (tok2->astOperand2() && tok2->astOperand2()->astOperand2() && isVariableChanged(tok2->astOperand2()->astOperand2(), tok2->link(), varid)) {
varid = 0U; varid = 0U;
if (settings->debugwarnings) if (settings->debugwarnings)
bailout(tokenlist, errorLogger, tok, "variable " + var->name() + " used in loop"); bailout(tokenlist, errorLogger, tok, "variable " + var->name() + " used in loop");

6
test/testgarbage.cpp
View File

@ -1,4 +1,3 @@
/* /*
* Cppcheck - A tool for static C/C++ code analysis * Cppcheck - A tool for static C/C++ code analysis
* Copyright (C) 2007-2015 Daniel Marjamäki and Cppcheck team. * Copyright (C) 2007-2015 Daniel Marjamäki and Cppcheck team.
@ -191,6 +190,7 @@ private:
TEST_CASE(garbageCode139); // #6659 TEST_CASE(garbageCode139); // #6659
TEST_CASE(garbageCode140); // #7035 TEST_CASE(garbageCode140); // #7035
TEST_CASE(garbageCode141); // #7043 TEST_CASE(garbageCode141); // #7043
TEST_CASE(garbageCode142); // #7050
TEST_CASE(garbageValueFlow); TEST_CASE(garbageValueFlow);
TEST_CASE(garbageSymbolDatabase); TEST_CASE(garbageSymbolDatabase);
@ -1114,6 +1114,10 @@ private:
ASSERT_THROW(checkCode("enum { X = << { X } } enum { X = X } = X ;"), InternalError); ASSERT_THROW(checkCode("enum { X = << { X } } enum { X = X } = X ;"), InternalError);
} }
void garbageCode142() { // #7050
checkCode("{ } ( ) { void mapGraphs ( ) { node_t * n ; for (!oid n ) { } } } { }");
}
void garbageValueFlow() { void garbageValueFlow() {
// #6089 // #6089