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

klocwork fixes; check that astSibling for comparison op does not return nullptr. remove check that pointer is non-null, the check should be redundant.

This commit is contained in:
Daniel Marjamäki 2021-10-28 08:55:08 +02:00
parent ce029f3ea7
commit eeaf2e5ff0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/checkstl.cpp
View File

@ -1352,7 +1352,7 @@ static bool if_findCompare(const Token * const tokBack, bool stdStringLike)
if (tok->isComparisonOp()) { if (tok->isComparisonOp()) {
if (stdStringLike) { if (stdStringLike) {
const Token * const tokOther = tokBack->astSibling(); const Token * const tokOther = tokBack->astSibling();
return !tokOther->hasKnownIntValue() || tokOther->getKnownIntValue() != 0; return !tokOther || !tokOther->hasKnownIntValue() || tokOther->getKnownIntValue() != 0;
} }
return (!tok->astOperand1()->isNumber() && !tok->astOperand2()->isNumber()); return (!tok->astOperand1()->isNumber() && !tok->astOperand2()->isNumber());
} }
@ -1379,7 +1379,7 @@ void CheckStl::if_find()
continue; continue;
const Token *conditionStart = scope.classDef->next(); const Token *conditionStart = scope.classDef->next();
if (conditionStart && Token::simpleMatch(conditionStart->astOperand2(), ";")) if (Token::simpleMatch(conditionStart->astOperand2(), ";"))
conditionStart = conditionStart->astOperand2(); conditionStart = conditionStart->astOperand2();
for (const Token *tok = conditionStart; tok->str() != "{"; tok = tok->next()) { for (const Token *tok = conditionStart; tok->str() != "{"; tok = tok->next()) {