tor

commit c8892b53ecaba5c14be6cf238baf4527098a8f1f
parent 8020d6fb05d9477e77c6ca554dc1288873f6115c
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue,  6 Nov 2018 15:35:45 -0500

Merge remote-tracking branch 'tor-github/pr/466'

Diffstat:
A
changes/ticket28077
 | 
3
+++
M
src/rust/tor_util/strings.rs
 | 
6
+-----

2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/changes/ticket28077 b/changes/ticket28077
@@ -0,0 +1,3 @@
+  o Code simplification and refactoring:
+    - Remove unnecessarily unsafe code from the rust macro cstr!. Closes
+      ticket 28077.
diff --git a/src/rust/tor_util/strings.rs b/src/rust/tor_util/strings.rs
@@ -105,11 +105,7 @@ macro_rules! cstr {
     ($($bytes:expr),*) => (
         ::std::ffi::CStr::from_bytes_with_nul(
             concat!($($bytes),*, "\0").as_bytes()
-        ).unwrap_or(
-            unsafe{
-                ::std::ffi::CStr::from_bytes_with_nul_unchecked(b"\0")
-            }
-        )
+        ).unwrap_or_default()
     )
 }