Add conversion for &Cstr and Cstring #5405
Conversation
|
|
||
| #[inline] | ||
| fn into_pyobject(self, py: Python<'py>) -> Result<Self::Output, Self::Error> { | ||
| // Convert cstr to &str, it's is safe because cstr is guaranteed to be valid UTF-8 |
There was a problem hiding this comment.
This is not true, a CStr can safely be constructed from any &[u8] without interior null bytes an thus may not contain valid utf8.
Instead of unwrapping this should use Utf8Error as its Error type, to forward the error to the caller.
|
|
||
| #[inline] | ||
| fn into_pyobject(self, py: Python<'py>) -> Result<Self::Output, Self::Error> { | ||
| // Convert cstring to &str, it's safe because cstring is guaranteed to be valid UTF-8 |
There was a problem hiding this comment.
This (and below) should internally make use of the CStr conversion above
| // Check for interior NUL bytes (excluding the final NUL) | ||
| for &byte in &bytes_with_nul[..size as usize] { | ||
| if byte == 0 { | ||
| return Err(PyValueError::new_err("string contains interior NUL bytes")); | ||
| } | ||
| } |
There was a problem hiding this comment.
No need to do this manually, we should make use of CStr::from_bytes_with_nul and just map the error.
| // Fallback for older Python versions | ||
| use std::ffi::FromBytesWithNulError; | ||
| let cow = py_string.to_cow()?; | ||
| let bytes = cow.as_bytes(); |
There was a problem hiding this comment.
I don't think this works, since the underlying buffer will not be null terminated. We may have to gate the whole impl under #[cfg(any(Py_3_10, not(Py_LIMITED_API)))]
| #[cfg(feature = "experimental-inspect")] | ||
| const INPUT_TYPE: &'static str = "str"; | ||
|
|
||
| fn extract(obj: Borrowed<'_, '_, PyAny>) -> Result<Self, Self::Error> { |
There was a problem hiding this comment.
This should make use of the CStr impl above and just call to_owned on the result.
No description provided.