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

Fix #11831 FP negativeContainerIndex / wrong return value from virtual function (#5240)

This commit is contained in:
chrchr-github 2023-07-13 20:38:47 +02:00 committed by GitHub
parent 258581ce2e
commit 48dd4dc33e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/programmemory.cpp
View File

@ -1394,7 +1394,7 @@ struct Executor {
return execute(tok); return execute(tok);
}); });
if (f) { if (f) {
if (fdepth >= 0) { if (fdepth >= 0 && !f->isImplicitlyVirtual()) {
ProgramMemory functionState; ProgramMemory functionState;
for (std::size_t i = 0; i < args.size(); ++i) { for (std::size_t i = 0; i < args.size(); ++i) {
const Variable* const arg = f->getArgumentVar(i); const Variable* const arg = f->getArgumentVar(i);

13
test/teststl.cpp
View File

@ -2334,6 +2334,19 @@ private:
"}\n"); "}\n");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
check("struct B { virtual int g() { return 0; } };\n" // #11831
"struct C {\n"
" int h() const { return b->g(); }\n"
" B* b;\n"
"};\n"
"struct O {\n"
" int f() const;\n"
" std::vector<int> v;\n"
" C c;\n"
"};\n"
"int O::f() const { return v[c.h() - 1]; }\n");
ASSERT_EQUALS("", errout.str());
const auto oldSettings = settings; const auto oldSettings = settings;
settings.daca = true; settings.daca = true;