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

This commit is contained in:
Nick Mathewson 2018-11-06 15:35:45 -05:00
commit c8892b53ec
2 changed files with 4 additions and 5 deletions

3
changes/ticket28077 Normal file
View File

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

View File

@ -105,11 +105,7 @@ macro_rules! cstr {
($($bytes:expr),*) => ( ($($bytes:expr),*) => (
::std::ffi::CStr::from_bytes_with_nul( ::std::ffi::CStr::from_bytes_with_nul(
concat!($($bytes),*, "\0").as_bytes() concat!($($bytes),*, "\0").as_bytes()
).unwrap_or( ).unwrap_or_default()
unsafe{
::std::ffi::CStr::from_bytes_with_nul_unchecked(b"\0")
}
)
) )
} }