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

Fixed #9851 (FP virtualDestructor - private virtual dtor)

This commit is contained in:
Daniel Marjamäki 2020-09-04 18:56:12 +02:00
parent 040da4ff32
commit 30d3643bb8
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/checkclass.cpp
View File

@ -1608,9 +1608,7 @@ void CheckClass::virtualDestructor()
if (scope->definedType->derivedFrom.empty()) { if (scope->definedType->derivedFrom.empty()) {
if (printInconclusive) { if (printInconclusive) {
const Function *destructor = scope->getDestructor(); const Function *destructor = scope->getDestructor();
if (destructor) { if (destructor && !destructor->hasVirtualSpecifier() && destructor->access == AccessControl::Public) {
if (!((destructor->hasVirtualSpecifier() && destructor->access == AccessControl::Public) ||
(destructor->access == AccessControl::Protected))) {
for (const Function &func : scope->functionList) { for (const Function &func : scope->functionList) {
if (func.hasVirtualSpecifier()) { if (func.hasVirtualSpecifier()) {
inconclusiveErrors.push_back(destructor); inconclusiveErrors.push_back(destructor);
@ -1619,7 +1617,6 @@ void CheckClass::virtualDestructor()
} }
} }
} }
}
continue; continue;
} }

7
test/testclass.cpp
View File

@ -2531,6 +2531,13 @@ private:
" ~Base(){}\n" " ~Base(){}\n"
"};\n", true); "};\n", true);
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
checkVirtualDestructor("class C {\n"
"private:\n"
" C();\n"
" virtual ~C();\n"
"};\n", true);
ASSERT_EQUALS("", errout.str());
} }
void checkNoMemset(const char code[]) { void checkNoMemset(const char code[]) {