nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-13 06:33:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

rust: Replace two unwrap()s in FFI code with unwrap_or()s.

Browse Source
This commit is contained in:
Isis Lovecruft 2018-02-10 01:21:31 +00:00
parent d9826b0a30
commit 45c59eff6c
No known key found for this signature in database
GPG Key ID: B8938BC5E86C046F
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rust/protover/ffi.rs
View File

@ -232,7 +232,7 @@ pub extern "C" fn protover_compute_for_old_tor(version: *const c_char) -> *const
// we can see that the bytes we're passing into it 1) are valid UTF-8, // we can see that the bytes we're passing into it 1) are valid UTF-8,
// 2) have no intermediate NUL bytes, and 3) are terminated with a NUL // 2) have no intermediate NUL bytes, and 3) are terminated with a NUL
// byte. // byte.
supported = CStr::from_bytes_with_nul(elder_protocols).unwrap(); supported = CStr::from_bytes_with_nul(elder_protocols).unwrap_or(empty);
supported.as_ptr() supported.as_ptr()
} }

2
src/rust/protover/protover.rs
View File

@ -110,7 +110,7 @@ pub fn get_supported_protocols() -> &'static str {
// The `unwrap` is safe becauase we SUPPORTED_PROTOCOLS is under // The `unwrap` is safe becauase we SUPPORTED_PROTOCOLS is under
// our control. // our control.
str::from_utf8(&SUPPORTED_PROTOCOLS[..SUPPORTED_PROTOCOLS.len() - 1]) str::from_utf8(&SUPPORTED_PROTOCOLS[..SUPPORTED_PROTOCOLS.len() - 1])
.unwrap() .unwrap_or("")
} }
pub struct SupportedProtocols(HashMap<Proto, Versions>); pub struct SupportedProtocols(HashMap<Proto, Versions>);