]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.3.4' into maint-0.3.5
authorNick Mathewson <nickm@torproject.org>
Tue, 23 Oct 2018 23:21:44 +0000 (19:21 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 23 Oct 2018 23:21:44 +0000 (19:21 -0400)
1  2 
src/rust/protover/ffi.rs
src/test/test_protover.c

index 0c28d032c65b416374271b0740ff357a84b97a13,f55b87acf6b0626df907c24eeffb8afd4913de8d..f17f30127d52f463d2619ae3ec8897edaf2d1f78
@@@ -57,17 -58,17 +57,20 @@@ pub extern "C" fn protover_all_supporte
  
      let relay_proto_entry: UnvalidatedProtoEntry =
          match UnvalidatedProtoEntry::from_str_any_len(relay_version) {
 -        Ok(n)  => n,
 -        Err(_) => return 1,
 -    };
 -    let maybe_unsupported: Option<UnvalidatedProtoEntry> = relay_proto_entry.all_supported();
 +            Ok(n) => n,
 +            Err(_) => return 1,
 +        };
  
 -    if maybe_unsupported.is_some() {
 -        let unsupported: UnvalidatedProtoEntry = maybe_unsupported.unwrap();
 +    if let Some(unsupported) = relay_proto_entry.all_supported() {
+         if missing_out.is_null() {
+             return 0;
+         }
 -        let ptr = allocate_and_copy_string(&unsupported.to_string());
 +        let c_unsupported: CString = match CString::new(unsupported.to_string()) {
 +            Ok(n) => n,
 +            Err(_) => return 1,
 +        };
 +
 +        let ptr = c_unsupported.into_raw();
          unsafe { *missing_out = ptr };
  
          return 0;
Simple merge