Skip to content

Fix 15030: Extra comment missing from inline multi-suppression #8852

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

Open
ludviggunne wants to merge 2 commits into
base: main
Choose a base branch
from
+52 −0
Open

Fix 15030: Extra comment missing from inline multi-suppression #8852

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
1644863
test
ludviggunne Sep 14, 2026
e8d8cc7
fix
ludviggunne Sep 14, 2026
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
24 changes: 24 additions & 0 deletions lib/suppressions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,30 @@ std::vector<SuppressionList::Suppression> SuppressionList::parseMultiSuppressCom
suppressions.push_back(std::move(s));
}

std::string::size_type extraPos = comment.find(';', end_position);
std::size_t delimSize = 1;

if (extraPos == std::string::npos) {
extraPos = comment.find("//", end_position);
delimSize = 2;
}

if (extraPos == std::string::npos)
return suppressions;

std::string extraComment = comment.substr(extraPos + delimSize);

if (extraComment.size() >= 2 && extraComment.compare(extraComment.size() - 2, 2, "*/") == 0)
extraComment.erase(extraComment.size() - 2, 2);

extraComment = trim(extraComment);

for (auto it = extraComment.begin(); it != extraComment.end();)
it = *it & 0x80 ? extraComment.erase(it) : it + 1;

for (auto &suppression : suppressions)
suppression.extraComment = extraComment;

return suppressions;
}

Expand Down
28 changes: 28 additions & 0 deletions test/testsuppressions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1388,6 +1388,34 @@ class TestSuppressions : public TestFixture {
suppressions=SuppressionList::parseMultiSuppressComment("/*cppcheck-suppress[errorId1, errorId2 symbolName=arr]*/", &errMsg);
ASSERT_EQUALS(2, suppressions.size());
ASSERT_EQUALS(true, errMsg.empty());

errMsg = "";
suppressions=SuppressionList::parseMultiSuppressComment("//cppcheck-suppress[errorId1, errorId2 symbolName=arr] ; extra comment", &errMsg);
ASSERT_EQUALS(2, suppressions.size());
ASSERT_EQUALS(true, errMsg.empty());
ASSERT_EQUALS("extra comment", suppressions[0].extraComment);
ASSERT_EQUALS("extra comment", suppressions[1].extraComment);

errMsg = "";
suppressions=SuppressionList::parseMultiSuppressComment("//cppcheck-suppress[errorId1, errorId2 symbolName=arr] // extra comment", &errMsg);
ASSERT_EQUALS(2, suppressions.size());
ASSERT_EQUALS(true, errMsg.empty());
ASSERT_EQUALS("extra comment", suppressions[0].extraComment);
ASSERT_EQUALS("extra comment", suppressions[1].extraComment);

errMsg = "";
suppressions=SuppressionList::parseMultiSuppressComment("/*cppcheck-suppress[errorId1, errorId2 symbolName=arr] ; extra comment */", &errMsg);
ASSERT_EQUALS(2, suppressions.size());
ASSERT_EQUALS(true, errMsg.empty());
ASSERT_EQUALS("extra comment", suppressions[0].extraComment);
ASSERT_EQUALS("extra comment", suppressions[1].extraComment);

errMsg = "";
suppressions=SuppressionList::parseMultiSuppressComment("/*cppcheck-suppress[errorId1, errorId2 symbolName=arr] // extra comment */", &errMsg);
ASSERT_EQUALS(2, suppressions.size());
ASSERT_EQUALS(true, errMsg.empty());
ASSERT_EQUALS("extra comment", suppressions[0].extraComment);
ASSERT_EQUALS("extra comment", suppressions[1].extraComment);
}

void globalSuppressions() { // Testing that Cppcheck::useGlobalSuppressions works (#8515)
Expand Down
Loading