rafaelcaricio/gstreamer-rs
1
0
Fork 0
forked from mirrors/gstreamer-rs
Code Pull requests Activity

gstreamer/log: Use non-panicking UTF8 conversion in log handler

Browse source 
Make sure that `log_handler` and `DebugMessage::get` do not panic while
processing non-UTF8 characters by using lossy instead of strict UTF8
string conversion.
This commit is contained in:
Fernando Jimenez Moreno 2019-10-02 11:01:44 +02:00 committed by Sebastian Dröge
parent 107ae588f2
commit 591468f53b
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gstreamer/src/log.rs
View file

@ -9,6 +9,7 @@
use DebugLevel;
use libc::c_char;
use std::borrow::Cow;
use std::ffi::CStr;
use std::fmt;
use std::ptr;
@ -30,14 +31,14 @@ impl fmt::Debug for DebugMessage {
}
impl DebugMessage {
pub fn get(&self) -> Option<&str> {
pub fn get(&self) -> Option<Cow<str>> {
unsafe {
let message = gst_sys::gst_debug_message_get(self.0.as_ptr());
if message.is_null() {
None
} else {
Some(CStr::from_ptr(message).to_str().unwrap())
Some(CStr::from_ptr(message).to_string_lossy())
}
}
}
@ -325,8 +326,8 @@ unsafe extern "C" fn log_handler<T>(
{
let category = DebugCategory(ptr::NonNull::new_unchecked(category));
let level = from_glib(level);
let file = CStr::from_ptr(file).to_str().unwrap();
let function = CStr::from_ptr(function).to_str().unwrap();
let file = CStr::from_ptr(file).to_string_lossy();
let function = CStr::from_ptr(function).to_string_lossy();
let line = line as u32;
let object: Option<glib::Object> = from_glib_borrow(object);
let message = DebugMessage(ptr::NonNull::new_unchecked(message));
@ -334,8 +335,8 @@ unsafe extern "C" fn log_handler<T>(
(handler)(
category,
level,
file,
function,
&file,
&function,
line,
object.as_ref(),
&message,
@ -465,7 +466,7 @@ mod tests {
}
assert_eq!(level, DebugLevel::Info);
assert_eq!(message.get(), Some("meh"));
assert_eq!(&message.get().unwrap(), "meh");
let _ = sender.lock().unwrap().send(());
};