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

Fix 10740: valueflow; conditional value. incremented value is oob. (#4208)

This commit is contained in:
Paul Fultz II 2022-06-12 00:16:28 -05:00 committed by GitHub
parent cee48e5e19
commit bd63534a1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/forwardanalyzer.cpp
View File

@ -580,6 +580,8 @@ struct ForwardTraversal {
if (!scopeEndToken) if (!scopeEndToken)
return Break(); return Break();
tok = skipTo(tok, scopeEndToken, end); tok = skipTo(tok, scopeEndToken, end);
if (!precedes(tok, end))
return Break(Analyzer::Terminate::Escape);
if (!analyzer->lowerToPossible()) if (!analyzer->lowerToPossible())
return Break(Analyzer::Terminate::Bail); return Break(Analyzer::Terminate::Bail);
// TODO: Don't break, instead move to the outer scope // TODO: Don't break, instead move to the outer scope

15
test/testbufferoverrun.cpp
View File

@ -190,6 +190,7 @@ private:
TEST_CASE(array_index_63); // #10979 TEST_CASE(array_index_63); // #10979
TEST_CASE(array_index_64); // #10878 TEST_CASE(array_index_64); // #10878
TEST_CASE(array_index_65); // #11066 TEST_CASE(array_index_65); // #11066
TEST_CASE(array_index_66); // #10740
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
@ -1835,6 +1836,20 @@ private:
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
} }
void array_index_66()
{
check("void foo(int j) {\n"
" int offsets[256];\n"
" while (x) {\n"
" if (j >= 256) break;\n"
" offsets[++j] = -1;\n"
" }\n"
"}\n");
ASSERT_EQUALS(
"[test.cpp:4] -> [test.cpp:5]: (warning) Either the condition 'j>=256' is redundant or the array 'offsets[256]' is accessed at index 256, which is out of bounds.\n",
errout.str());
}
void array_index_multidim() { void array_index_multidim() {
check("void f()\n" check("void f()\n"
"{\n" "{\n"