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

[tor/maint-0.3.5] Merge remote-tracking branch 'tor-github/pr/431' into bug27740_035_fix
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit 22338d63c4e579801788727ca3e09fc15f931622 Merge: de55df026 7bf9c93ab Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 30 09:33:58 2018 -0400 Merge remote-tracking branch 'tor-github/pr/431' into bug27740_035_fix changes/bug27741 | 5 +++++ src/rust/protover/ffi.rs | 19 ++++--------------- 2 files changed, 9 insertions(+), 15 deletions(-)

1 0

[tor/maint-0.3.5] Merge branch 'bug27740_035_fix' into maint-0.3.5
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit 4b6b58ed8ec6f5870bf5825e0013339f0223fa06 Merge: a9db07f32 22338d63c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 15 16:11:06 2018 -0500 Merge branch 'bug27740_035_fix' into maint-0.3.5 src/rust/protover/ffi.rs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)

1 0

[tor/master] Try to restore a proper fix for bug27740 in 0.3.5.
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit 632e0406595ade9da40317a777f438c43ea5b5f3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 30 07:37:17 2018 -0400 Try to restore a proper fix for bug27740 in 0.3.5. (I messed up the merge in 289a7dbac32a981897e12a3c250f0b6c67eec809.) --- src/rust/protover/ffi.rs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs index f17f30127..e29efd6df 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;

1 0

[tor/release-0.3.5] remove now-unused "use" statement.
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit de55df0260a25ed26119174555a17c4b29657a90 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 30 09:28:10 2018 -0400 remove now-unused "use" statement. --- src/rust/protover/ffi.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs index e29efd6df..451bf4665 100644 --- a/src/rust/protover/ffi.rs +++ b/src/rust/protover/ffi.rs @@ -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;

1 0

[tor/master] remove now-unused "use" statement.
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit de55df0260a25ed26119174555a17c4b29657a90 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 30 09:28:10 2018 -0400 remove now-unused "use" statement. --- src/rust/protover/ffi.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs index e29efd6df..451bf4665 100644 --- a/src/rust/protover/ffi.rs +++ b/src/rust/protover/ffi.rs @@ -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;

1 0

[tor/master] Merge branch 'bug27740_035_fix' into maint-0.3.5
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit 4b6b58ed8ec6f5870bf5825e0013339f0223fa06 Merge: a9db07f32 22338d63c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 15 16:11:06 2018 -0500 Merge branch 'bug27740_035_fix' into maint-0.3.5 src/rust/protover/ffi.rs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/431' into bug27740_035_fix
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit 22338d63c4e579801788727ca3e09fc15f931622 Merge: de55df026 7bf9c93ab Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 30 09:33:58 2018 -0400 Merge remote-tracking branch 'tor-github/pr/431' into bug27740_035_fix changes/bug27741 | 5 +++++ src/rust/protover/ffi.rs | 19 ++++--------------- 2 files changed, 9 insertions(+), 15 deletions(-)

1 0

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

15 Nov '18

commit 31cc0d2c0bce11dbddec9e5869fdb2ce1acc001d Merge: 92f71b8e8 4b6b58ed8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 15 16:11:29 2018 -0500 Merge branch 'maint-0.3.5' src/rust/protover/ffi.rs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)

1 0

[tor/release-0.3.5] Merge branch 'bug27740_035_fix' into maint-0.3.5
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit 4b6b58ed8ec6f5870bf5825e0013339f0223fa06 Merge: a9db07f32 22338d63c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 15 16:11:06 2018 -0500 Merge branch 'bug27740_035_fix' into maint-0.3.5 src/rust/protover/ffi.rs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)

1 0

[tor/release-0.3.5] Try to restore a proper fix for bug27740 in 0.3.5.
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit 632e0406595ade9da40317a777f438c43ea5b5f3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 30 07:37:17 2018 -0400 Try to restore a proper fix for bug27740 in 0.3.5. (I messed up the merge in 289a7dbac32a981897e12a3c250f0b6c67eec809.) --- src/rust/protover/ffi.rs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs index f17f30127..e29efd6df 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;

1 0