impl TryFromObject for CString

coolreader18 · coolreader18 · commit 289311727bcb · 2020-03-27T14:40:20.000-05:00
diff --git a/vm/src/obj/objstr.rs b/vm/src/obj/objstr.rs
@@ -31,7 +31,7 @@ use crate::function::{single_or_tuple_any, OptionalArg, PyFuncArgs};
 use crate::pyhash;
 use crate::pyobject::{
     Either, IdProtocol, IntoPyObject, ItemProtocol, PyClassImpl, PyContext, PyIterable,
-    PyObjectRef, PyRef, PyResult, PyValue, TryIntoRef, TypeProtocol,
+    PyObjectRef, PyRef, PyResult, PyValue, TryFromObject, TryIntoRef, TypeProtocol,
 };
 use crate::vm::VirtualMachine;
 
@@ -1351,6 +1351,14 @@ impl IntoPyObject for &String {
     }
 }
 
+impl TryFromObject for std::ffi::CString {
+    fn try_from_object(vm: &VirtualMachine, obj: PyObjectRef) -> PyResult<Self> {
+        let s = PyStringRef::try_from_object(vm, obj)?;
+        Self::new(s.as_str().to_owned())
+            .map_err(|_| vm.new_value_error("embedded null character".to_owned()))
+    }
+}
+
 #[derive(FromArgs)]
 struct SplitArgs {
     #[pyarg(positional_or_keyword, default = "None")]
