Skip to content

Fix out-of-bounds access to std::unique_ptr<T[]> #111581

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
merged 1 commit into from
Oct 9, 2024
Merged

Fix out-of-bounds access to std::unique_ptr<T[]> #111581

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
6 changes: 3 additions & 3 deletions clang/lib/Frontend/TextDiagnostic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1252,10 +1252,10 @@ highlightLines(StringRef FileData, unsigned StartLineNumber,
for (unsigned I = 0; I <= Spelling.size(); ++I) {
// This line is done.
if (I == Spelling.size() || isVerticalWhitespace(Spelling[I])) {
SmallVector<TextDiagnostic::StyleRange> &LineRanges =
SnippetRanges[L - StartLineNumber];

if (L >= StartLineNumber) {
SmallVector<TextDiagnostic::StyleRange> &LineRanges =
SnippetRanges[L - StartLineNumber];

if (L == TokenStartLine) // First line
appendStyle(LineRanges, T, StartCol, LineLength);
else if (L == TokenEndLine) // Last line
Expand Down
27 changes: 27 additions & 0 deletions clang/test/Frontend/highlight-text.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// RUN: %clang_cc1 -fsyntax-only %s 2> %t
// RUN: FileCheck < %t %s
#define F (1 << 99)

#define M \
F | F

int a = M;
// CHECK: :8:9: warning: shift count >= width of type [-Wshift-count-overflow]
// CHECK-NEXT: 8 | int a = M;
// CHECK-NEXT: | ^
// CHECK-NEXT: :5:11: note: expanded from macro 'M'
// CHECK-NEXT: 5 | #define M \
// CHECK-NEXT: | ^
// CHECK-NEXT: :3:14: note: expanded from macro '\
// CHECK-NEXT: F'
// CHECK-NEXT: 3 | #define F (1 << 99)
// CHECK-NEXT: | ^ ~~
// CHECK-NEXT: :8:9: warning: shift count >= width of type [-Wshift-count-overflow]
// CHECK-NEXT: 8 | int a = M;
// CHECK-NEXT: | ^
// CHECK-NEXT: :6:5: note: expanded from macro 'M'
// CHECK-NEXT: 6 | F | F
// CHECK-NEXT: | ^
// CHECK-NEXT: :3:14: note: expanded from macro 'F'
// CHECK-NEXT: 3 | #define F (1 << 99)
// CHECK-NEXT: | ^ ~~
Loading