migrations/winit
1
0
Fork 0
mirror of https://github.com/rust-windowing/winit.git synced 2026-08-29 04:40:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(macOS): clamp IME selected_range to prevent substringToIndex crash

Browse Source 
macOS native Pinyin IME can send a selected_range that exceeds the
marked text string length (e.g. index 8 for a 6-character string).
This caused an NSRangeException in substringToIndex:, crashing the
application with SIGABRT.

Clamp both location and end to the string's UTF-16 length before
calling substringToIndex.
This commit is contained in:
Takaranoao
2026-03-01 04:55:06 -08:00
committed by GitHub
parent 44865be79d
commit 85ff2fa093
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
winit-appkit/src/view.rs
View File

@@ -304,9 +304,15 @@ define_class!(
// sending a `None` cursor range. // sending a `None` cursor range.
None None
} else { } else {
// Clamp to string length to avoid NSRangeException from out-of-bounds
// indices sent by macOS IME (e.g. native Pinyin, see
// https://github.com/alacritty/alacritty/issues/8791).
let len = string.length();
let location = selected_range.location.min(len);
let end = selected_range.end().min(len);
// Convert the selected range from UTF-16 indices to UTF-8 indices. // Convert the selected range from UTF-16 indices to UTF-8 indices.
let sub_string_a = string.substringToIndex(selected_range.location); let sub_string_a = string.substringToIndex(location);
let sub_string_b = string.substringToIndex(selected_range.end()); let sub_string_b = string.substringToIndex(end);
let lowerbound_utf8 = sub_string_a.len(); let lowerbound_utf8 = sub_string_a.len();
let upperbound_utf8 = sub_string_b.len(); let upperbound_utf8 = sub_string_b.len();
Some((lowerbound_utf8, upperbound_utf8)) Some((lowerbound_utf8, upperbound_utf8))

1
winit/src/changelog/unreleased.md
View File

@@ -55,4 +55,5 @@ changelog entry.
- On Redox, handle `EINTR` when reading from `event_socket` instead of panicking. - On Redox, handle `EINTR` when reading from `event_socket` instead of panicking.
- On Wayland, switch from using the `ahash` hashing algorithm to `foldhash`. - On Wayland, switch from using the `ahash` hashing algorithm to `foldhash`.
- On macOS, fix borderless game presentation options not sticking after switching spaces. - On macOS, fix borderless game presentation options not sticking after switching spaces.
- On macOS, fix crash in `set_marked_text` when native Pinyin IME sends out-of-bounds `selected_range`.
- On X11, fix debug mode overflow panic in `set_timestamp`. - On X11, fix debug mode overflow panic in `set_timestamp`.