Fix crash for diagnostics around source with embedded nulls#8164
Open
damyanp wants to merge 2 commits intomicrosoft:mainfrom
Open
Fix crash for diagnostics around source with embedded nulls#8164damyanp wants to merge 2 commits intomicrosoft:mainfrom
damyanp wants to merge 2 commits intomicrosoft:mainfrom
Conversation
There was a problem hiding this comment.
Pull request overview
Fixes a crash in DXC’s diagnostic range highlighting when the input source contains embedded null bytes, by making the highlighter bail out instead of asserting/crashing, and adds a regression test to cover the scenario.
Changes:
- Update
highlightRange()to return early when trimming whitespace causes the start/end columns to cross (e.g., due to embedded null bytes). - Add a new DXC lit test that feeds an HLSL source containing an embedded
\x00and verifies an expected diagnostic instead of a crash.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| tools/clang/lib/Frontend/TextDiagnostic.cpp | Avoids crashing/asserting when a token highlight range becomes invalid after whitespace trimming. |
| tools/clang/test/DXC/highlight-range-null-byte.test | Regression test ensuring embedded null bytes don’t crash diagnostics/highlighting. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
V-FEXrt
approved these changes
Feb 21, 2026
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
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.
Previously if the source contained embedded nulls and a diagnostic range included that this would result in an assert firing (and then a crash in builds without asserts).
This change makes it quietly return in this case, and adds a regression test for this situation.