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

Fixed #6383 (FP shiftNegative - value converted to unsigned in function argument)

This commit is contained in:
Daniel Marjamäki 2015-12-14 10:55:23 +01:00
parent 3082612e6d
commit 0baad496f2
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/checkother.cpp
View File

@ -2178,6 +2178,11 @@ void CheckOther::redundantCopyError(const Token *tok,const std::string& varname)
// Checking for shift by negative values // Checking for shift by negative values
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
static bool isNegative(const Token *tok, const Settings *settings)
{
return tok->valueType() && tok->valueType()->sign == ValueType::SIGNED && tok->getValueLE(-1LL, settings);
}
void CheckOther::checkNegativeBitwiseShift() void CheckOther::checkNegativeBitwiseShift()
{ {
for (const Token* tok = _tokenizer->tokens(); tok; tok = tok->next()) { for (const Token* tok = _tokenizer->tokens(); tok; tok = tok->next()) {
@ -2213,9 +2218,9 @@ void CheckOther::checkNegativeBitwiseShift()
continue; continue;
// Get negative rhs value. preferably a value which doesn't have 'condition'. // Get negative rhs value. preferably a value which doesn't have 'condition'.
if (tok->astOperand1()->getValueLE(-1LL, _settings)) if (isNegative(tok->astOperand1(), _settings))
negativeBitwiseShiftError(tok, 1); negativeBitwiseShiftError(tok, 1);
else if (tok->astOperand2()->getValueLE(-1LL, _settings)) else if (isNegative(tok->astOperand2(), _settings))
negativeBitwiseShiftError(tok, 2); negativeBitwiseShiftError(tok, 2);
} }
} }

4
test/testother.cpp
View File

@ -4788,6 +4788,10 @@ private:
// Negative LHS // Negative LHS
check("const int x = -1 >> 2;"); check("const int x = -1 >> 2;");
ASSERT_EQUALS("[test.cpp:1]: (error) Shifting a negative value is undefined behaviour\n", errout.str()); ASSERT_EQUALS("[test.cpp:1]: (error) Shifting a negative value is undefined behaviour\n", errout.str());
// #6383 - unsigned type
check("const int x = (unsigned int)(-1) >> 2;");
ASSERT_EQUALS("", errout.str());
} }
void incompleteArrayFill() { void incompleteArrayFill() {