Skip to content

Partial fix for #11522 FP AssignmentIntegerToAddress with function pointer #8009

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
chrchr-github merged 9 commits into from
Dec 8, 2025
+33 −8
Merged

Partial fix for #11522 FP AssignmentIntegerToAddress with function pointer #8009

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
05b7173
Update check64bit.cpp
chrchr-github Dec 3, 2025
0cde666
Update test64bit.cpp
chrchr-github Dec 3, 2025
c56d4db
Merge branch 'main' into chr_11522
chrchr-github Dec 7, 2025
4278ee6
Update tokenize.cpp
chrchr-github Dec 8, 2025
e4036c4
Update tokenize.h
chrchr-github Dec 8, 2025
c70ec62
Update check64bit.cpp
chrchr-github Dec 8, 2025
e20aaac
Update tokenize.cpp
chrchr-github Dec 8, 2025
7dfe32e
Update tokenize.h
chrchr-github Dec 8, 2025
60f59b9
Merge branch 'danmar:main' into chr_11522
chrchr-github Dec 8, 2025
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
10 changes: 9 additions & 1 deletion lib/check64bit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,13 @@ static bool is32BitIntegerReturn(const Function* func, const Settings* settings)
return vt && vt->pointer == 0 && vt->isIntegral() && vt->typeSize(settings->platform) == 4;
}

static bool isFunctionPointer(const Token* tok)
{
if (!tok || !tok->variable())
return false;
return Token::Match(tok->variable()->nameToken(), "%name% ) (");
}

void Check64BitPortability::pointerassignment()
{
if (!mSettings->severity.isEnabled(Severity::portability))
Expand Down Expand Up @@ -120,7 +127,8 @@ void Check64BitPortability::pointerassignment()
!tok->astOperand2()->isNumber() &&
rhstype->pointer == 0U &&
rhstype->originalTypeName.empty() &&
rhstype->type == ValueType::Type::INT)
rhstype->type == ValueType::Type::INT &&
!isFunctionPointer(tok->astOperand1()))
assignmentIntegerToAddressError(tok);

// Assign pointer to integer..
Expand Down
6 changes: 6 additions & 0 deletions test/test64bit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,12 @@ class Test64BitPortability : public TestFixture {
" t.a[i][j] = new std::vector<int>;\n"
"}\n");
ASSERT_EQUALS("", errout_str());

check("int f();\n" // #11522
"void g() {\n"
" int (*fp)() = *(int(*)())f;\n"
"}\n");
ASSERT_EQUALS("", errout_str());
}

void novardecl() {
Expand Down
Loading