Skip to content

fixed #13687 - avoid null pointer dereference with incomplete remark comment #7370

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 1 commit into from
Mar 11, 2025
Merged

fixed #13687 - avoid null pointer dereference with incomplete remark comment #7370

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
4 changes: 4 additions & 0 deletions lib/preprocessor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,8 @@ static bool parseInlineSuppressionCommentToken(const simplecpp::Token *tok, std:
}

static std::string getRelativeFilename(const simplecpp::Token* tok, const Settings &settings) {
if (!tok)
return "";
std::string relativeFilename(tok->location.file());
if (settings.relativePaths) {
for (const std::string & basePath : settings.basePaths) {
Expand Down Expand Up @@ -1079,6 +1081,8 @@ void Preprocessor::addRemarkComments(const simplecpp::TokenList &tokens, std::ve
remarkedToken = prev;
break;
}
if (!remarkedToken)
continue;

// Relative filename
const std::string relativeFilename = getRelativeFilename(remarkedToken, mSettings);
Expand Down
1 change: 1 addition & 0 deletions test/cli/fuzz-crash/crash-2cf8ffd04628a7c025bb07074462a51c1284dff0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
//REMARK /
7 changes: 7 additions & 0 deletions test/testpreprocessor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ class TestPreprocessor : public TestFixture {
TEST_CASE(remarkComment1);
TEST_CASE(remarkComment2);
TEST_CASE(remarkComment3);
TEST_CASE(remarkComment4);

// Using -D to predefine symbols
TEST_CASE(predefine1);
Expand Down Expand Up @@ -1940,6 +1941,12 @@ class TestPreprocessor : public TestFixture {
ASSERT_EQUALS("assignment with 1 ", remarkComments[0].str);
}

void remarkComment4() {
const char code[] = "//REMARK /";
const auto remarkComments = PreprocessorHelper::getRemarkComments(code, *this);
ASSERT_EQUALS(0, remarkComments.size());
}

void predefine1() {
const std::string src("#if defined X || Y\n"
"Fred & Wilma\n"
Expand Down