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

Fixed #6249 (False positive: Incorrect detection of (assignment + comparison) inside for-clause)

This commit is contained in:
Daniel Marjamäki 2015-02-05 20:17:30 +01:00
parent f19d4afcde
commit eec938dbad
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/checkcondition.cpp
View File

@ -781,7 +781,8 @@ void CheckCondition::clarifyCondition()
// This might be a template // This might be a template
if (!isC && tok2->link()) if (!isC && tok2->link())
break; break;
if (Token::simpleMatch(tok2->astParent(), "?"))
break;
clarifyConditionError(tok, tok->strAt(2) == "=", false); clarifyConditionError(tok, tok->strAt(2) == "=", false);
break; break;
} else if (!tok2->isName() && !tok2->isNumber() && tok2->str() != ".") } else if (!tok2->isName() && !tok2->isNumber() && tok2->str() != ".")

4
test/testcondition.cpp
View File

@ -1213,6 +1213,10 @@ private:
"}"); "}");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
check("void f() {\n"
" if (x = b < 0 ? 1 : 2) {}\n" // don't simplify and verify this code
"}", false);
ASSERT_EQUALS("", errout.str());
} }
// clarify conditions with bitwise operator and comparison // clarify conditions with bitwise operator and comparison