CheckBufferOverrun: The simplifyKnownVariables() has been reduced, use ValueFlow instead

This commit is contained in:
Daniel Marjamäki 2015-11-07 18:12:01 +01:00
parent 3655ce7222
commit 9c7271a5e9
2 changed files with 31 additions and 0 deletions

View File

@ -1079,6 +1079,30 @@ void CheckBufferOverrun::checkGlobalAndLocalVariable()
if (value && value->intvalue > strLen) if (value && value->intvalue > strLen)
bufferOverrunError(tok, tok->str()); bufferOverrunError(tok, tok->str());
} }
if (Token::Match(tok, "%var% [") && tok->variable() && tok->variable()->isPointer()) {
const ValueFlow::Value *value = tok->next()->astOperand2()->getMaxValue(false);
if (!value)
continue;
for (std::list<ValueFlow::Value>::const_iterator it = tok->values.begin(); it != tok->values.end(); ++it) {
if (!it->tokvalue)
continue;
const Variable *var = it->tokvalue->variable();
if (var && var->isArray() && value->intvalue > var->dimension(0)) {
std::list<const Token *> callstack;
callstack.push_back(it->tokvalue);
callstack.push_back(tok);
std::vector<MathLib::bigint> index;
index.push_back(value->intvalue);
const ArrayInfo arrayInfo(var, _tokenizer, &_settings->library);
arrayIndexOutOfBoundsError(callstack, arrayInfo, index);
}
}
}
} }
// check all known fixed size arrays first by just looking them up // check all known fixed size arrays first by just looking them up

View File

@ -2058,6 +2058,13 @@ private:
check("namespace { class X { static const int x[100]; };\n" // #6232 check("namespace { class X { static const int x[100]; };\n" // #6232
"const int X::x[100] = {0}; }", false, "test.cpp"); "const int X::x[100] = {0}; }", false, "test.cpp");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
check("void f() {\n"
" int a[10];\n"
" int *p = a;\n"
" p[20] = 0;\n"
"}");
ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (error) Array 'a[10]' accessed at index 20, which is out of bounds.\n", errout.str());
} }
void array_index_function_parameter() { void array_index_function_parameter() {