min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid panicking in error handling

This commit is contained in:
Kornel 2025-06-05 01:44:25 +01:00 committed by Kornel
parent 05f798adc4
commit 29c05d41cd
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
boring/src/error.rs
View File

@ -118,9 +118,8 @@ impl Error {
// in the error stack, so we'll need to copy it off if it's dynamic // in the error stack, so we'll need to copy it off if it's dynamic
let data = if flags & ffi::ERR_FLAG_STRING != 0 { let data = if flags & ffi::ERR_FLAG_STRING != 0 {
let bytes = CStr::from_ptr(data as *const _).to_bytes(); let bytes = CStr::from_ptr(data as *const _).to_bytes();
let data = str::from_utf8(bytes).unwrap(); let data = String::from_utf8_lossy(bytes).into_owned();
let data = Cow::Owned(data.to_string()); Some(data.into())
Some(data)
} else { } else {
None None
}; };
@ -178,7 +177,7 @@ impl Error {
return None; return None;
} }
let bytes = CStr::from_ptr(cstr as *const _).to_bytes(); let bytes = CStr::from_ptr(cstr as *const _).to_bytes();
Some(str::from_utf8(bytes).unwrap()) str::from_utf8(bytes).ok()
} }
} }
@ -196,7 +195,7 @@ impl Error {
return None; return None;
} }
let bytes = CStr::from_ptr(cstr as *const _).to_bytes(); let bytes = CStr::from_ptr(cstr as *const _).to_bytes();
Some(str::from_utf8(bytes).unwrap()) str::from_utf8(bytes).ok()
} }
} }
@ -208,7 +207,7 @@ impl Error {
return None; return None;
} }
let bytes = CStr::from_ptr(cstr as *const _).to_bytes(); let bytes = CStr::from_ptr(cstr as *const _).to_bytes();
Some(str::from_utf8(bytes).unwrap()) str::from_utf8(bytes).ok()
} }
} }
@ -220,9 +219,11 @@ impl Error {
/// Returns the name of the source file which encountered the error. /// Returns the name of the source file which encountered the error.
pub fn file(&self) -> &'static str { pub fn file(&self) -> &'static str {
unsafe { unsafe {
assert!(!self.file.is_null()); if self.file.is_null() {
return "";
}
let bytes = CStr::from_ptr(self.file as *const _).to_bytes(); let bytes = CStr::from_ptr(self.file as *const _).to_bytes();
str::from_utf8(bytes).unwrap() str::from_utf8(bytes).unwrap_or_default()
} }
} }
@ -233,9 +234,8 @@ impl Error {
} }
/// Returns additional data describing the error. /// Returns additional data describing the error.
#[allow(clippy::option_as_ref_deref)]
pub fn data(&self) -> Option<&str> { pub fn data(&self) -> Option<&str> {
self.data.as_ref().map(|s| &**s) self.data.as_deref()
} }
} }