From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 30 Oct 2018 11:37:17 +0000 (-0400)
Subject: Try to restore a proper fix for bug27740 in 0.3.5.
X-Git-Tag: tor-0.3.5.5-alpha~8^2^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=632e0406595ade9da40317a777f438c43ea5b5f3;p=thirdparty%2Ftor.git

Try to restore a proper fix for bug27740 in 0.3.5.

(I messed up the merge in 289a7dbac32a981897e12a3c250f0b6c67eec809.)
---

diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs
index f17f30127d..e29efd6dfc 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;