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

Fix 11784: FP arrayIndexOutOfBounds when increment is counted twice (#5186)

This commit is contained in:
Paul Fultz II 2023-06-24 13:08:55 -05:00 committed by GitHub
parent 6c750d9ae9
commit 60321edd0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/forwardanalyzer.cpp
View File

@ -671,7 +671,8 @@ struct ForwardTraversal {
return Break();
} else {
Token* stepTok = getStepTok(tok);
if (updateLoop(end, endBlock, condTok, initTok, stepTok) == Progress::Break)
// Dont pass initTok since it was already evaluated
if (updateLoop(end, endBlock, condTok, nullptr, stepTok) == Progress::Break)
return Break();
}
tok = endBlock;

16
test/testbufferoverrun.cpp
View File

@ -174,6 +174,7 @@ private:
TEST_CASE(array_index_69); // #6370
TEST_CASE(array_index_70); // #11355
TEST_CASE(array_index_71); // #11461
TEST_CASE(array_index_72); // #11784
TEST_CASE(array_index_multidim);
TEST_CASE(array_index_switch_in_for);
TEST_CASE(array_index_for_in_for); // FP: #2634
@ -1924,6 +1925,21 @@ private:
ASSERT_EQUALS("", errout.str());
}
// #11784
void array_index_72()
{
check("char f(int i) {\n"
" char d[4] = {};\n"
" for (; i < 3; i++) {}\n"
" for (i++; i > 0;) {\n"
" d[--i] = 1;\n"
" break;\n"
" }\n"
" return d[3];\n"
"}\n");
ASSERT_EQUALS("", errout.str());
}
void array_index_multidim() {
check("void f()\n"
"{\n"