Commit 05d65cb0 authored by Nick Mathewson's avatar Nick Mathewson 🦞
Browse files

Merge branch 'maint-0.3.5'

parents afc22ec5 289a7dba

changes/bug27740

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (rust):

    - Return a string that can be safely freed by C code, not one created by

      the rust allocator, in protover_all_supported(). Fixes bug 27740; bugfix

      on 0.3.3.1-alpha.

changes/bug27804

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (rust):

    - Fix a potential null dereference in protover_all_supported().

      Add a test for it. Fixes bug 27804; bugfix on 0.3.3.1-alpha.

src/rust/protover/ffi.rs

+3 −0
Original line number Diff line number Diff line
@@ -62,6 +62,9 @@ pub extern "C" fn protover_all_supported( 
        };



    if let Some(unsupported) = relay_proto_entry.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,

src/test/test_protover.c

+1 −0
Original line number Diff line number Diff line
@@ -268,6 +268,7 @@ test_protover_all_supported(void *arg) 
  tt_ptr_op(msg, OP_EQ, NULL);



  // Some things we don't support

  tt_assert(! protover_all_supported("Wombat=9", NULL));

  tt_assert(! protover_all_supported("Wombat=9", &msg));

  tt_str_op(msg, OP_EQ, "Wombat=9");

  tor_free(msg);