commit 632e0406595ade9da40317a777f438c43ea5b5f3 Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 30 07:37:17 2018 -0400
Try to restore a proper fix for bug27740 in 0.3.5.
(I messed up the merge in 289a7dbac32a981897e12a3c250f0b6c67eec809.) --- src/rust/protover/ffi.rs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs index f17f30127..e29efd6df 100644 --- a/src/rust/protover/ffi.rs +++ b/src/rust/protover/ffi.rs @@ -65,12 +65,7 @@ pub extern "C" fn protover_all_supported( if missing_out.is_null() { return 0; } - let c_unsupported: CString = match CString::new(unsupported.to_string()) { - Ok(n) => n, - Err(_) => return 1, - }; - - let ptr = c_unsupported.into_raw(); + let ptr = allocate_and_copy_string(&unsupported.to_string()); unsafe { *missing_out = ptr };
return 0;