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

Prevent null dereference on X11 with bad locale

Browse Source
This commit is contained in:
Kirill Chibisov
2022-06-08 01:04:33 +03:00
committed by GitHub
parent f10a984ba3
commit 224872ce03
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/platform_impl/linux/x11/ime/context.rs
View File

@@ -103,7 +103,14 @@ extern "C" fn preedit_draw_callback(
if xim_text.encoding_is_wchar > 0 { if xim_text.encoding_is_wchar > 0 {
return; return;
} }
let new_text = unsafe { CStr::from_ptr(xim_text.string.multi_byte) };
let new_text = unsafe { xim_text.string.multi_byte };
if new_text.is_null() {
return;
}
let new_text = unsafe { CStr::from_ptr(new_text) };
String::from(new_text.to_str().expect("Invalid UTF-8 String from IME")) String::from(new_text.to_str().expect("Invalid UTF-8 String from IME"))
.chars() .chars()