Skip to content

Fix #10157: FP invalidFunctionArg with memset (if-branch should be discarded) #7080

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
danmar merged 2 commits into from
Dec 8, 2024
Merged

Fix #10157: FP invalidFunctionArg with memset (if-branch should be discarded) #7080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f9a9a7
add test
ludviggunne Dec 7, 2024
116c5ec
fix #10157
ludviggunne Dec 7, 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
1 change: 1 addition & 0 deletions lib/checkfunctions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ void CheckFunctions::invalidFunctionUsage()
const SymbolDatabase* symbolDatabase = mTokenizer->getSymbolDatabase();
for (const Scope *scope : symbolDatabase->functionScopes) {
for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
tok = skipUnreachableBranch(tok);
if (!Token::Match(tok, "%name% ( !!)"))
continue;
const Token * const functionToken = tok;
Expand Down
18 changes: 18 additions & 0 deletions test/testfunctions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ class TestFunctions : public TestFixture {
TEST_CASE(invalidFunctionUsage1);
TEST_CASE(invalidFunctionUsageStrings);

// Invalid function argument
TEST_CASE(invalidFunctionArg1);

// Math function usage
TEST_CASE(mathfunctionCall_fmod);
TEST_CASE(mathfunctionCall_sqrt);
Expand Down Expand Up @@ -755,6 +758,21 @@ class TestFunctions : public TestFixture {
ASSERT_EQUALS("[test.c:1]: (error) Invalid puts() argument nr 1. A nul-terminated string is required.\n", errout_str());
}

void invalidFunctionArg1() {
const Settings settingsUnix32 = settingsBuilder(settings).platform(Platform::Unix32).build();
check("int main() {\n"
" char tgt[7];\n"
" char src[7+1] = \"7777777\";\n"
" if (sizeof tgt <= sizeof src) {\n"
" memmove(&tgt, &src, sizeof tgt);\n"
" } else {\n"
" memmove(&tgt, &src, sizeof src);\n"
" memset(&tgt + sizeof src, ' ', sizeof tgt - sizeof src);\n"
" }\n"
"}\n", false, &settingsUnix32);
ASSERT_EQUALS("", errout_str());
}

void mathfunctionCall_sqrt() {
// sqrt, sqrtf, sqrtl
check("void foo()\n"
Expand Down