]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Try to restore a proper fix for bug27740 in 0.3.5.
authorNick Mathewson <nickm@torproject.org>
Tue, 30 Oct 2018 11:37:17 +0000 (07:37 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 30 Oct 2018 11:37:20 +0000 (07:37 -0400)
(I messed up the merge in 289a7dbac32a981897e12a3c250f0b6c67eec809.)

src/rust/protover/ffi.rs

index f17f30127d52f463d2619ae3ec8897edaf2d1f78..e29efd6dfc5526ebab5661b93c027411db3579dc 100644 (file)
@@ -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;