October 2018 - tor-commits - lists.torproject.org

[tor/release-0.3.5] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 24 Oct '18

24 Oct '18

commit 7edc594ee732960733d34309980d0e7190e35fb2 Merge: d1eac7830 169bc670d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 23 19:18:23 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27740 | 4 ++++ changes/bug27804 | 3 +++ src/rust/protover/ffi.rs | 10 ++++------ src/test/test_protover.c | 1 + 4 files changed, 12 insertions(+), 6 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'onionk/rust-allsupportednull1' into maint-0.3.3
by nickm＠torproject.org 24 Oct '18

24 Oct '18

commit 169bc670ddf9fe898800a2814a1ec30dcc3249da Merge: 93fd924bd 42558df7c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 23 19:17:48 2018 -0400 Merge remote-tracking branch 'onionk/rust-allsupportednull1' into maint-0.3.3 changes/bug27740 | 4 ++++ changes/bug27804 | 3 +++ src/rust/protover/ffi.rs | 10 ++++------ src/test/test_protover.c | 1 + 4 files changed, 12 insertions(+), 6 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.5'
by nickm＠torproject.org 24 Oct '18

24 Oct '18

commit 05d65cb067d542a2d7eb001aa300fd8b836a84a0 Merge: afc22ec53 289a7dbac Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 23 19:22:05 2018 -0400 Merge branch 'maint-0.3.5' changes/bug27740 | 4 ++++ changes/bug27804 | 3 +++ src/rust/protover/ffi.rs | 3 +++ src/test/test_protover.c | 1 + 4 files changed, 11 insertions(+)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 24 Oct '18

24 Oct '18

commit 8a0728789b1943ba39f41c1f09fe5da50838464c Merge: cf1906542 169bc670d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 23 19:18:23 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug27740 | 4 ++++ changes/bug27804 | 3 +++ src/rust/protover/ffi.rs | 10 ++++------ src/test/test_protover.c | 1 + 4 files changed, 12 insertions(+), 6 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.4' into maint-0.3.5
by nickm＠torproject.org 24 Oct '18

24 Oct '18

commit 289a7dbac32a981897e12a3c250f0b6c67eec809 Merge: 1ae911660 7edc594ee Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 23 19:21:44 2018 -0400 Merge branch 'maint-0.3.4' into maint-0.3.5 changes/bug27740 | 4 ++++ changes/bug27804 | 3 +++ src/rust/protover/ffi.rs | 3 +++ src/test/test_protover.c | 1 + 4 files changed, 11 insertions(+) diff --cc src/rust/protover/ffi.rs index 0c28d032c,f55b87acf..f17f30127 --- a/src/rust/protover/ffi.rs +++ b/src/rust/protover/ffi.rs @@@ -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;

1 0

[tor/release-0.3.5] Merge remote-tracking branch 'onionk/rust-allsupportednull1' into maint-0.3.3
by nickm＠torproject.org 24 Oct '18

24 Oct '18

commit 169bc670ddf9fe898800a2814a1ec30dcc3249da Merge: 93fd924bd 42558df7c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 23 19:17:48 2018 -0400 Merge remote-tracking branch 'onionk/rust-allsupportednull1' into maint-0.3.3 changes/bug27740 | 4 ++++ changes/bug27804 | 3 +++ src/rust/protover/ffi.rs | 10 ++++------ src/test/test_protover.c | 1 + 4 files changed, 12 insertions(+), 6 deletions(-)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
by nickm＠torproject.org 24 Oct '18

24 Oct '18

commit 271144c99e00d0596d3a8f7e2c278f2b2789c115 Merge: 64f363737 7edc594ee Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 23 19:18:23 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 changes/bug27740 | 4 ++++ changes/bug27804 | 3 +++ src/rust/protover/ffi.rs | 10 ++++------ src/test/test_protover.c | 1 + 4 files changed, 12 insertions(+), 6 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 24 Oct '18

24 Oct '18

commit 7edc594ee732960733d34309980d0e7190e35fb2 Merge: d1eac7830 169bc670d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 23 19:18:23 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27740 | 4 ++++ changes/bug27804 | 3 +++ src/rust/protover/ffi.rs | 10 ++++------ src/test/test_protover.c | 1 + 4 files changed, 12 insertions(+), 6 deletions(-)

1 0

[tor/release-0.3.5] rust/protover: return C-allocated string in protover_all_supported()
by nickm＠torproject.org 24 Oct '18

24 Oct '18

commit 42558df7c8affeec33e66d987ccf4d632a9d5466 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Fri Sep 21 05:16:22 2018 +0000 rust/protover: return C-allocated string in protover_all_supported() The result of CString::into_raw() is not safe to free with free() except under finicky and fragile circumstances that we definitely don't meet right now. This was missed in be583a34a3815c2c10e86094ab0610e4b7f9c869. --- changes/bug27740 | 4 ++++ src/rust/protover/ffi.rs | 7 +------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/changes/bug27740 b/changes/bug27740 new file mode 100644 index 000000000..76a17b7dd --- /dev/null +++ b/changes/bug27740 @@ -0,0 +1,4 @@ + 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. diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs index ca9a504fe..8ab11842d 100644 --- a/src/rust/protover/ffi.rs +++ b/src/rust/protover/ffi.rs @@ -71,12 +71,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;

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 24 Oct '18

24 Oct '18

commit 7edc594ee732960733d34309980d0e7190e35fb2 Merge: d1eac7830 169bc670d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 23 19:18:23 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27740 | 4 ++++ changes/bug27804 | 3 +++ src/rust/protover/ffi.rs | 10 ++++------ src/test/test_protover.c | 1 + 4 files changed, 12 insertions(+), 6 deletions(-)

1 0