TIFU; Keep unsafe out of the public api.

open-dx · Apr 14, 2024 · f0e99f0 · f0e99f0
1 parent 744c220
commit f0e99f0
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/core/src/string.rs b/core/src/string.rs
@@ -4,13 +4,15 @@ use crate::error::CStringError;
 
 
 /// TODO
-pub unsafe fn try_unwrap_cstr<'out>(bytes: *const i8) -> Result<&'out str, CStringError> {
+pub fn try_unwrap_cstr<'out>(bytes: *const i8) -> Result<&'out str, CStringError> {
     if bytes.is_null() {
         return Err(CStringError::Uninitialized);
     }
 
-    match CStr::from_ptr(bytes).to_str() {
-        Ok(c_str) => Ok(c_str),
-        Err(error) => Err(CStringError::Utf8Error(error)),
+    unsafe {
+        match CStr::from_ptr(bytes).to_str() {
+            Ok(c_str) => Ok(c_str),
+            Err(error) => Err(CStringError::Utf8Error(error)),
+        }
     }
 }