bhrebec/xwayland-satellite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix panic when WM_NAME or NET_WM_NAME has invalid UTF-8

Browse source
This commit is contained in:
galister 2024-06-14 11:46:06 +09:00 • committed by Shawn Wallace
parent b6d281967c
commit f261e3feec
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/xstate/mod.rs
View file

@ -519,7 +519,8 @@ impl XState {
let cookie = self.get_property_cookie(window, x::ATOM_WM_NAME, x::ATOM_STRING, 256); let cookie = self.get_property_cookie(window, x::ATOM_WM_NAME, x::ATOM_STRING, 256);
let resolver = |reply: x::GetPropertyReply| { let resolver = |reply: x::GetPropertyReply| {
let data: &[u8] = reply.value(); let data: &[u8] = reply.value();
WmName::WmName(String::from_utf8(data.to_vec()).unwrap()) let name = String::from_utf8_lossy(data).to_string();
WmName::WmName(name)
}; };
PropertyCookieWrapper { PropertyCookieWrapper {
@ -537,7 +538,8 @@ impl XState {
self.get_property_cookie(window, self.atoms.net_wm_name, self.atoms.utf8_string, 256); self.get_property_cookie(window, self.atoms.net_wm_name, self.atoms.utf8_string, 256);
let resolver = |reply: x::GetPropertyReply| { let resolver = |reply: x::GetPropertyReply| {
let data: &[u8] = reply.value(); let data: &[u8] = reply.value();
WmName::NetWmName(String::from_utf8(data.to_vec()).unwrap()) let name = String::from_utf8_lossy(data).to_string();
WmName::NetWmName(name)
}; };
PropertyCookieWrapper { PropertyCookieWrapper {