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

Fix off by one, resolve C4334

This commit is contained in:
Dmitry-Me 2017-08-14 18:07:36 +03:00
parent b995e59ff2
commit d3d9c76f01
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/valueflow.cpp
View File

@ -290,9 +290,14 @@ static void setTokenValue(Token* tok, const ValueFlow::Value &value, const Setti
setTokenValue(parent, castValue(value, valueType.sign, settings->long_bit), settings);
else if (valueType.type == ValueType::Type::LONGLONG)
setTokenValue(parent, castValue(value, valueType.sign, settings->long_long_bit), settings);
else if (value.isIntValue() && value.intvalue < (1 << (settings->char_bit - 1)) && value.intvalue > -(1 << (settings->char_bit - 1)))
// unknown type, but value is small so there should be no truncation etc
setTokenValue(parent,value,settings);
else if (value.isIntValue()) {
const int charMax = (1 << (settings->char_bit - 1)) - 1;
const int charMin = -charMax - 1;
if (charMin <= value.intvalue && value.intvalue <= charMax) {
// unknown type, but value is small so there should be no truncation etc
setTokenValue(parent,value,settings);
}
}
}
else if (parent->str() == ":") {