Skip to content

Fix #13409 Crash in valueFlowUnknownFunctionReturn() #7095

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
firewave merged 3 commits into from
Dec 11, 2024
Merged

Fix #13409 Crash in valueFlowUnknownFunctionReturn() #7095

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
2205b9f
Update library.cpp
chrchr-github Dec 11, 2024
81cd42a
Update testvalueflow.cpp
chrchr-github Dec 11, 2024
51737d8
Update testvalueflow.cpp
chrchr-github Dec 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
6 changes: 6 additions & 0 deletions lib/library.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1205,6 +1205,8 @@ const Library::AllocFunc* Library::getAllocFuncInfo(const Token *tok) const
{
while (Token::simpleMatch(tok, "::"))
tok = tok->astOperand2() ? tok->astOperand2() : tok->astOperand1();
if (!tok)
return nullptr;
const std::string funcname = getFunctionName(tok);
return isNotLibraryFunction(tok) && mData->mFunctions.find(funcname) != mData->mFunctions.end() ? nullptr : getAllocDealloc(mData->mAlloc, funcname);
}
Expand All @@ -1214,6 +1216,8 @@ const Library::AllocFunc* Library::getDeallocFuncInfo(const Token *tok) const
{
while (Token::simpleMatch(tok, "::"))
tok = tok->astOperand2() ? tok->astOperand2() : tok->astOperand1();
if (!tok)
return nullptr;
const std::string funcname = getFunctionName(tok);
return isNotLibraryFunction(tok) && mData->mFunctions.find(funcname) != mData->mFunctions.end() ? nullptr : getAllocDealloc(mData->mDealloc, funcname);
}
Expand All @@ -1223,6 +1227,8 @@ const Library::AllocFunc* Library::getReallocFuncInfo(const Token *tok) const
{
while (Token::simpleMatch(tok, "::"))
tok = tok->astOperand2() ? tok->astOperand2() : tok->astOperand1();
if (!tok)
return nullptr;
const std::string funcname = getFunctionName(tok);
return isNotLibraryFunction(tok) && mData->mFunctions.find(funcname) != mData->mFunctions.end() ? nullptr : getAllocDealloc(mData->mRealloc, funcname);
}
Expand Down
9 changes: 9 additions & 0 deletions test/testvalueflow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ class TestValueFlow : public TestFixture {
TEST_CASE(valueFlowDynamicBufferSize);

TEST_CASE(valueFlowSafeFunctionParameterValues);
TEST_CASE(valueFlowUnknownFunctionReturn);
TEST_CASE(valueFlowUnknownFunctionReturnRand);
TEST_CASE(valueFlowUnknownFunctionReturnMalloc);

Expand Down Expand Up @@ -7240,6 +7241,14 @@ class TestValueFlow : public TestFixture {
ASSERT_EQUALS(100, values.back().intvalue);
}

void valueFlowUnknownFunctionReturn() {
const char code[] = "template <typename T>\n" // #13409
"struct S {\n"
" std::max_align_t T::* m;\n"
" S(std::max_align_t T::* p) : m(p) {}\n"
"};\n";
(void)valueOfTok(code, ":"); // don't crash
}

void valueFlowUnknownFunctionReturnRand() {
const char *code;
Expand Down
Loading