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

Fix 10254: false positive: arrayIndexOutOfBounds in inline function (#3266)

This commit is contained in:
Paul Fultz II 2021-05-22 01:20:09 -05:00 committed by GitHub
parent 22ae4543a6
commit 1e3ab460a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/valueflow.cpp
View File

@ -5609,11 +5609,11 @@ static void valueFlowLibraryFunction(Token *tok, const std::string &returnValue,
static void valueFlowSubFunction(TokenList* tokenlist, SymbolDatabase* symboldatabase, ErrorLogger* errorLogger, const Settings* settings) static void valueFlowSubFunction(TokenList* tokenlist, SymbolDatabase* symboldatabase, ErrorLogger* errorLogger, const Settings* settings)
{ {
int id = 0;
for (const Scope* scope : symboldatabase->functionScopes) { for (const Scope* scope : symboldatabase->functionScopes) {
const Function* function = scope->function; const Function* function = scope->function;
if (!function) if (!function)
continue; continue;
int id = 0;
for (const Token *tok = scope->bodyStart; tok != scope->bodyEnd; tok = tok->next()) { for (const Token *tok = scope->bodyStart; tok != scope->bodyEnd; tok = tok->next()) {
if (!Token::Match(tok, "%name% (")) if (!Token::Match(tok, "%name% ("))
continue; continue;
@ -5670,7 +5670,7 @@ static void valueFlowSubFunction(TokenList* tokenlist, SymbolDatabase* symboldat
argtok->expressionString() + argtok->expressionString() +
"' value is " + "' value is " +
v.infoString()); v.infoString());
v.path = 256 * v.path + id; v.path = 256 * v.path + id % 256;
// Change scope of lifetime values // Change scope of lifetime values
if (v.isLifetimeValue()) if (v.isLifetimeValue())
v.lifetimeScope = ValueFlow::Value::LifetimeScope::SubFunction; v.lifetimeScope = ValueFlow::Value::LifetimeScope::SubFunction;

18
test/testbufferoverrun.cpp
View File

@ -132,6 +132,7 @@ private:
TEST_CASE(array_index_52); // #7682 TEST_CASE(array_index_52); // #7682
TEST_CASE(array_index_53); // #4750 TEST_CASE(array_index_53); // #4750
TEST_CASE(array_index_54); // #10268 TEST_CASE(array_index_54); // #10268
TEST_CASE(array_index_55); // #10254
TEST_CASE(array_index_multidim); TEST_CASE(array_index_multidim);
TEST_CASE(array_index_switch_in_for); TEST_CASE(array_index_switch_in_for);
TEST_CASE(array_index_for_in_for); // FP: #2634 TEST_CASE(array_index_for_in_for); // FP: #2634
@ -1567,6 +1568,23 @@ private:
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
} }
void array_index_55() {
check("void make(const char* s, size_t len) {\n"
" for (size_t i = 0; i < len; ++i)\n"
" s[i];\n"
"}\n"
"void make(const char* s) {\n"
" make(s, strlen(s));\n"
"}\n"
"void f() {\n"
" make(\"my-utf8-payload\");\n"
"}\n"
"void f2() {\n"
" make(\"false\");\n"
"}\n");
ASSERT_EQUALS("", errout.str());
}
void array_index_multidim() { void array_index_multidim() {
check("void f()\n" check("void f()\n"
"{\n" "{\n"