Browse Source

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

Nick Mathewson 6 years ago
parent
commit
c8892b53ec
2 changed files with 4 additions and 5 deletions
  1. 3 0
      changes/ticket28077
  2. 1 5
      src/rust/tor_util/strings.rs

+ 3 - 0
changes/ticket28077

@@ -0,0 +1,3 @@
+  o Code simplification and refactoring:
+    - Remove unnecessarily unsafe code from the rust macro cstr!. Closes
+      ticket 28077.

+ 1 - 5
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()
     )
 }