Skip to content

Fix #13296 nullptr dereference in CheckLeakAutoVar::checkScope() #6995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
orbitcowboy merged 3 commits into from
Nov 11, 2024
Merged

Fix #13296 nullptr dereference in CheckLeakAutoVar::checkScope() #6995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8e2982
Fix #13296 nullptr dereference in CheckLeakAutoVar::checkScope()
chrchr-github Nov 11, 2024
a153fde
Merge
chrchr-github Nov 11, 2024
1a22f51
Format
chrchr-github Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/checkleakautovar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
bool skipElseBlock = false;
const Token *condTok = tok->astSibling();

if (condTok->hasKnownIntValue()) {
if (condTok && condTok->hasKnownIntValue()) {
skipIfBlock = !condTok->getKnownIntValue();
skipElseBlock = !skipIfBlock;
}
Expand Down
13 changes: 13 additions & 0 deletions test/testleakautovar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ class TestLeakAutoVar : public TestFixture {
TEST_CASE(ifelse26);
TEST_CASE(ifelse27);
TEST_CASE(ifelse28); // #11038
TEST_CASE(ifelse29);

// switch
TEST_CASE(switch1);
Expand Down Expand Up @@ -2322,6 +2323,18 @@ class TestLeakAutoVar : public TestFixture {
ASSERT_EQUALS("", errout_str());
}

void ifelse29() { // #13296
check("struct S {\n"
" typedef int (S::* func_t)(int) const;\n"
" void f(func_t pfn);\n"
" int g(int) const;\n"
"};\n"
"void S::f(func_t pfn) {\n"
" if (pfn == (func_t)&S::g) {}\n"
"}\n", true);
ASSERT_EQUALS("", errout_str()); // don't crash
}

void switch1() {
check("void f() {\n"
" char *p = 0;\n"
Expand Down