Skip to content

Fix unwrap panic in extract_number_for_key in impl TraitAccessorPrivate for CTFontTraits on macOS Ventura. - #735

Merged
jdm merged 2 commits into
servo:mainfrom
vorporeal:vorporeal/fix-ventura-crash
Jul 13, 2025
Merged

Fix unwrap panic in extract_number_for_key in impl TraitAccessorPrivate for CTFontTraits on macOS Ventura.#735
jdm merged 2 commits into
servo:mainfrom
vorporeal:vorporeal/fix-ventura-crash

Conversation

@vorporeal

Copy link
Copy Markdown
Contributor

This splits out the final chunk of #517 to be reviewed and merged.

As discussed on that PR, in an ideal world, we'd have a test we could write to prove that this is required.

In practice, Warp has been using the logic in that PR for the past 3 years without issues. We did attempt, 6 months ago, to switch over to upstream (without the patch here) and had to revert that change due to this still being an issue for users running Ventura.

Given the above, we have confidence that:

  1. This patch is still required for proper behavior on macOS Ventura, and
  2. It is sufficiently well-tested, in production, that it is safe to merge.

@vorporeal

Copy link
Copy Markdown
Contributor Author

Fixed the formatting issues here. If y'all don't use squash commits, let me know and I can merge the formatting changes into the base commit.

Also, let me know if there's anything I should do vis-a-vis the build failures - they seem unrelated to my change here.

@jdm

jdm commented Jul 12, 2025

Copy link
Copy Markdown
Member

Yeah, I think those are clippy failures from newer rust versions that we need to address before we can merge anything.

@jdm

jdm commented Jul 13, 2025

Copy link
Copy Markdown
Member

Please go ahead and rebase to have the CI issues go away.

@vorporeal
vorporeal force-pushed the vorporeal/fix-ventura-crash branch from fef5f18 to 19374bd Compare July 13, 2025 06:19
@vorporeal

Copy link
Copy Markdown
Contributor Author

Done.

@jdm
jdm added this pull request to the merge queue Jul 13, 2025
Merged via the queue into servo:main with commit 0bcad1e Jul 13, 2025
@vorporeal

vorporeal commented Aug 1, 2025

Copy link
Copy Markdown
Contributor Author

No rush at all (we are using a [patch] directive), but would be awesome if this could go out as an updated core-text release at some point. :)

@jdm jdm mentioned this pull request Aug 1, 2025
@jdm

jdm commented Aug 1, 2025

Copy link
Copy Markdown
Member

#738

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants