Merge branch 'bug27740_035_fix' into maint-0.3.5

This commit is contained in:
Nick Mathewson 2018-11-15 16:11:06 -05:00
commit 4b6b58ed8e

View File

@ -7,7 +7,6 @@
use libc::{c_char, c_int, uint32_t};
use std::ffi::CStr;
use std::ffi::CString;
use smartlist::*;
use tor_allocate::allocate_and_copy_string;
@ -65,12 +64,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;