Skip to content

fix: use lossy UTF-8 conversion for device sysname to avoid panic #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
neuralbroker wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: use lossy UTF-8 conversion for device sysname to avoid panic #98

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/device.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,11 +388,14 @@ impl Device {
/// Get the system name of the device.
///
/// To get the descriptive device name, use `name`.
pub fn sysname(&self) -> &str {
///
/// The sysname is the name of the device in the `/sys` filesystem.
/// If the sysname is not valid UTF-8, the invalid bytes are replaced
/// with `U+FFFD REPLACEMENT CHARACTER`.
pub fn sysname(&self) -> Cow<'_, str> {
unsafe {
CStr::from_ptr(ffi::libinput_device_get_sysname(self.as_raw_mut()))
.to_str()
.expect("Device sysname is no valid utf8")
.to_string_lossy()
}
}

Expand Down