diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-10-23 19:21:44 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-10-23 19:21:44 -0400 |
| commit | 289a7dbac32a981897e12a3c250f0b6c67eec809 (patch) | |
| tree | b2cc8602755d501b7817f9b1c5973d0b01b4cf2e /src/rust | |
| parent | 1ae91166016ec70a242c6dbb14c9ca5e77b1313f (diff) | |
| parent | 7edc594ee732960733d34309980d0e7190e35fb2 (diff) | |
| download | tor-289a7dbac32a981897e12a3c250f0b6c67eec809.tar.gz tor-289a7dbac32a981897e12a3c250f0b6c67eec809.zip | |
Merge branch 'maint-0.3.4' into maint-0.3.5
Diffstat (limited to 'src/rust')
| -rw-r--r-- | src/rust/protover/ffi.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs index 0c28d032c6..f17f30127d 100644 --- a/src/rust/protover/ffi.rs +++ b/src/rust/protover/ffi.rs @@ -62,6 +62,9 @@ pub extern "C" fn protover_all_supported( }; if let Some(unsupported) = relay_proto_entry.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, |