Skip to content

refs #14280 - report inline suppressions without an error ID #8011

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 1 commit into from
Dec 9, 2025
+48 −5
Merged

refs #14280 - report inline suppressions without an error ID #8011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 12 additions & 3 deletions lib/preprocessor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,18 +88,22 @@ static bool parseInlineSuppressionCommentToken(const simplecpp::Token *tok, std:
const std::string::size_type pos1 = comment.find_first_not_of("/* \t");
if (pos1 == std::string::npos)
return false;
if (pos1 + cppchecksuppress.size() >= comment.size())
return false;
if (comment.substr(pos1, cppchecksuppress.size()) != cppchecksuppress)
return false;
if (pos1 + cppchecksuppress.size() >= comment.size()) {
bad.emplace_back(tok->location.file(), tok->location.line, 0, "suppression without error ID");
return false;
}

// check if it has a prefix
const std::string::size_type posEndComment = comment.find_first_of(" [", pos1+cppchecksuppress.size());

// skip spaces after "cppcheck-suppress" and its possible prefix
const std::string::size_type pos2 = comment.find_first_not_of(' ', posEndComment);
if (pos2 == std::string::npos)
if (pos2 == std::string::npos) {
bad.emplace_back(tok->location.file(), tok->location.line, 0, "suppression without error ID");
return false;
}

SuppressionList::Type errorType = SuppressionList::Type::unique;

Expand Down Expand Up @@ -142,9 +146,11 @@ static bool parseInlineSuppressionCommentToken(const simplecpp::Token *tok, std:
s.lineNumber = tok->location.line;
}

// TODO: return false?
if (!errmsg.empty())
bad.emplace_back(tok->location.file(), tok->location.line, tok->location.col, std::move(errmsg));

// TODO: report ones without ID - return false?
std::copy_if(suppressions.cbegin(), suppressions.cend(), std::back_inserter(inlineSuppressions), [](const SuppressionList::Suppression& s) {
return !s.errorId.empty();
});
Expand All @@ -159,9 +165,12 @@ static bool parseInlineSuppressionCommentToken(const simplecpp::Token *tok, std:
s.type = errorType;
s.lineNumber = tok->location.line;

// TODO: report when no ID - unreachable?
if (!s.errorId.empty())
inlineSuppressions.push_back(std::move(s));

// TODO: unreachable?
// TODO: return false?
if (!errmsg.empty())
bad.emplace_back(tok->location.file(), tok->location.line, tok->location.col, std::move(errmsg));
}
Expand Down
38 changes: 36 additions & 2 deletions test/testsuppressions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,6 @@ class TestSuppressions : public TestFixture {
}
#endif // HAS_THREADING_MODEL_FORK

// TODO: check all results
void runChecks(unsigned int (TestSuppressions::*check)(const char[], const std::string &)) {
// check to make sure the appropriate errors are present
ASSERT_EQUALS(1, (this->*check)("void f() {\n"
Expand Down Expand Up @@ -720,6 +719,40 @@ class TestSuppressions : public TestFixture {
"[test.cpp:6:0]: (error) unknown suppression type 'cppcheck-suppress-end-unknown' [invalidSuppression]\n"
"[test.cpp:4:0]: (error) Suppress Begin: No matching end [invalidSuppression]\n", errout_str());

ASSERT_EQUALS(1, (this->*check)("// cppcheck-suppress-file\n"
"// cppcheck-suppress\n"
"// cppcheck-suppress \n"
"// cppcheck-suppress\t\n"
"// cppcheck-suppress []\n" // TODO
"// cppcheck-suppress-macro\n"
"// cppcheck-suppress-begin\n"
"// cppcheck-suppress-begin id0\n"
"void f() {}\n"
"// cppcheck-suppress-end\n",
""));
ASSERT_EQUALS("[test.cpp:1:0]: (error) suppression without error ID [invalidSuppression]\n"
"[test.cpp:2:0]: (error) suppression without error ID [invalidSuppression]\n"
"[test.cpp:3:0]: (error) suppression without error ID [invalidSuppression]\n"
"[test.cpp:4:0]: (error) suppression without error ID [invalidSuppression]\n"
"[test.cpp:6:0]: (error) suppression without error ID [invalidSuppression]\n"
"[test.cpp:7:0]: (error) suppression without error ID [invalidSuppression]\n"
"[test.cpp:10:0]: (error) suppression without error ID [invalidSuppression]\n"
"[test.cpp:8:0]: (error) Suppress Begin: No matching end [invalidSuppression]\n", errout_str());

ASSERT_EQUALS(1, (this->*check)("// cppcheck-suppress:\n"
"// cppcheck-suppress-unknown\n"
"// cppcheck-suppress-begin-unknown\n"
"// cppcheck-suppress-begin\n"
"void f() {}\n"
"// cppcheck-suppress-end-unknown\n",
""));
// TODO: actually these are all invalid types
ASSERT_EQUALS("[test.cpp:1:0]: (error) suppression without error ID [invalidSuppression]\n"
"[test.cpp:2:0]: (error) suppression without error ID [invalidSuppression]\n"
"[test.cpp:3:0]: (error) suppression without error ID [invalidSuppression]\n"
"[test.cpp:4:0]: (error) suppression without error ID [invalidSuppression]\n"
"[test.cpp:6:0]: (error) suppression without error ID [invalidSuppression]\n", errout_str());

ASSERT_EQUALS(1, (this->*check)("void f() {\n"
" int a;\n"
" // cppcheck-suppress-begin uninitvar\n"
Expand Down Expand Up @@ -915,13 +948,14 @@ class TestSuppressions : public TestFixture {
"uninitvar"));
ASSERT_EQUALS("", errout_str());

// cppcheck-suppress-macro
// TODO: check result
(this->*check)("// cppcheck-suppress-macro zerodiv\n"
"#define DIV(A,B) A/B\n"
"a = DIV(10,0);\n",
"");
ASSERT_EQUALS("", errout_str());

// TODO: check result
(this->*check)("// cppcheck-suppress-macro abc\n"
"#define DIV(A,B) A/B\n"
"a = DIV(10,1);\n",
Expand Down
Loading