Fix race condition in OpenPathDelegate#57290
Merged
Merged
Conversation
Directory entries and string matches can briefly go out of sync during async updates. When that happens, we used to highlight the wrong substring (best case), or panic if the offset happens to be mid-Unicode or out of range. After this change, we fall back to rendering a row without highlights when matches are out of sync. The highlight will be shown on the next frame. This is a rare condition and the easiest fix, so should be acceptable.
maxdeviant
approved these changes
May 20, 2026
zed-zippy Bot
added a commit
that referenced
this pull request
May 21, 2026
…57291) (cherry-pick to preview) (#57367) Cherry-pick of #57291 to preview ---- HighlightedLabel would crash the application if any provided highlight index was invalid. In theory, this should never happen. In practice, this can happen due to race conditions at call sites. After this change, we only panic in debug builds. In release builds, we log an error and return a label with no highlights. The error message includes the call site so that it's easier to fix the root cause. Related to #57290 Part of FR-11. Release Notes: - N/A Co-authored-by: Oleksiy Syvokon <oleksiy@zed.dev>
zed-zippy Bot
added a commit
that referenced
this pull request
May 21, 2026
…57291) (cherry-pick to stable) (#57366) Cherry-pick of #57291 to stable ---- HighlightedLabel would crash the application if any provided highlight index was invalid. In theory, this should never happen. In practice, this can happen due to race conditions at call sites. After this change, we only panic in debug builds. In release builds, we log an error and return a label with no highlights. The error message includes the call site so that it's easier to fix the root cause. Related to #57290 Part of FR-11. Release Notes: - N/A Co-authored-by: Oleksiy Syvokon <oleksiy@zed.dev>
TomPlanche
pushed a commit
to TomPlanche/zed
that referenced
this pull request
Jun 2, 2026
Directory entries and string matches can briefly go out of sync during async updates. When that happens, we used to highlight the wrong substring (best case), or panic if the offset happens to be mid-Unicode or out of range. After this change, we fall back to rendering a row without highlights when matches are out of sync. The highlight will be shown on the next frame. This is a rare condition and the easiest fix, so should be acceptable. Closes FR-11 Release Notes: - Fixed rare panic in the open path dialog
TomPlanche
pushed a commit
to TomPlanche/zed
that referenced
this pull request
Jun 2, 2026
…ed-industries#57291) HighlightedLabel would crash the application if any provided highlight index was invalid. In theory, this should never happen. In practice, this can happen due to race conditions at call sites. After this change, we only panic in debug builds. In release builds, we log an error and return a label with no highlights. The error message includes the call site so that it's easier to fix the root cause. Related to zed-industries#57290 Part of FR-11. Release Notes: - N/A
This was referenced Jun 3, 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
2 participants
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.
Directory entries and string matches can briefly go out of sync during async updates. When that happens, we used to highlight the wrong substring (best case), or panic if the offset happens to be mid-Unicode or out of range.
After this change, we fall back to rendering a row without highlights when matches are out of sync. The highlight will be shown on the next frame. This is a rare condition and the easiest fix, so should be acceptable.
Closes FR-11
Release Notes: