[Clang] Fix an out of bound access in -verify comment parsing #141940
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When the comment ends with a splice at EOF. Fixes llvm#141221
|
@llvm/pr-subscribers-clang Author: cor3ntin (cor3ntin) ChangesWhen the comment ends with a splice at EOF. Fixes #141221 Full diff: https://github.com/llvm/llvm-project/pull/141940.diff 2 Files Affected:
diff --git a/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp b/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp
index 89fda3e839cb9..eb241f34d095e 100644
--- a/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp
+++ b/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp
@@ -812,7 +812,7 @@ bool VerifyDiagnosticConsumer::HandleComment(Preprocessor &PP,
C2 += C.substr(last, loc-last);
last = loc + 1;
- if (C[last] == '\n' || C[last] == '\r') {
+ if (last < C.size() && (C[last] == '\n' || C[last] == '\r')) {
++last;
// Escape \r\n or \n\r, but not \n\n.
diff --git a/clang/test/Frontend/verify-gh141221.c b/clang/test/Frontend/verify-gh141221.c
new file mode 100644
index 0000000000000..eb0be46a3da8b
--- /dev/null
+++ b/clang/test/Frontend/verify-gh141221.c
@@ -0,0 +1,6 @@
+// RUN: %clang_cc1 -verify %s
+
+// Check that we don't crash if the file ends in a splice
+// This file should *NOT* end with a new line
+a;
+// expected-error@-1 {{}} \
\ No newline at end of file
|
zyn0217
approved these changes
May 29, 2025
llvmbot
added
the
clang:frontend
cor3ntin
force-pushed
the
corentin/gh141221
branch
from
10f354d to
ca2ea73
Compare
svkeerthy
pushed a commit
that referenced
this pull request
May 29, 2025
When the comment ends with a splice at EOF. Fixes #141221
google-yfyang
pushed a commit
to google-yfyang/llvm-project
that referenced
this pull request
May 29, 2025
…41940) When the comment ends with a splice at EOF. Fixes llvm#141221
shafik
reviewed
May 29, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When the comment ends with a splice at EOF.
Fixes #141221