Fix crash when opening files with a BOM on macOS #40419
Merged
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
cla-bot
bot
added
the
cla-signed
xipeng-jin
pushed a commit
to xipeng-jin/zed
that referenced
this pull request
Oct 17, 2025
Closes zed-industries#40359 We were segfaulting when opening a UTF-8 file starting with a byte order mark due to a mismatch in our UTF-16 indexing calculations caused by Core Foundations `replace_str` stripping the BOM internally. This PR fixes the crash by replacing one of our manual calculations by calling the Core Foundations API to get the length of a string. Release Notes: - Fixed a crash on macOS when opening a file that starts with a UTF-8 byte order mark (BOM). Co-authored-by: HactarCE <6060305+HactarCE@users.noreply.github.com>
P1n3appl3
pushed a commit
to P1n3appl3/zed
that referenced
this pull request
Oct 18, 2025
Closes zed-industries#40359 We were segfaulting when opening a UTF-8 file starting with a byte order mark due to a mismatch in our UTF-16 indexing calculations caused by Core Foundations `replace_str` stripping the BOM internally. This PR fixes the crash by replacing one of our manual calculations by calling the Core Foundations API to get the length of a string. Release Notes: - Fixed a crash on macOS when opening a file that starts with a UTF-8 byte order mark (BOM). Co-authored-by: HactarCE <6060305+HactarCE@users.noreply.github.com>
mikayla-maki
pushed a commit
that referenced
this pull request
Oct 21, 2025
Closes #40359 We were segfaulting when opening a UTF-8 file starting with a byte order mark due to a mismatch in our UTF-16 indexing calculations caused by Core Foundations `replace_str` stripping the BOM internally. This PR fixes the crash by replacing one of our manual calculations by calling the Core Foundations API to get the length of a string. Release Notes: - Fixed a crash on macOS when opening a file that starts with a UTF-8 byte order mark (BOM). Co-authored-by: HactarCE <6060305+HactarCE@users.noreply.github.com>
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.
Closes #40359
We were segfaulting when opening a UTF-8 file starting with a byte order mark due to a mismatch in our UTF-16 indexing calculations caused by Core Foundations
replace_strstripping the BOM internally. This PR fixes the crash by replacing one of our manual calculations by calling the Core Foundations API to get the length of a string.Release Notes: