Skip to content
Snippets Groups Projects
Commit 0c04b54d authored by Chelsea Holland Komlo's avatar Chelsea Holland Komlo Committed by Nick Mathewson
Browse files

minimize scope for unsafe

update documentation

missing check for null
parent d1820c15
No related branches found
No related tags found
No related merge requests found
......@@ -26,7 +26,7 @@ move_rust_str_to_c_and_free(rust_str_ref_t src, char **dest)
}
if (!dest) {
log_warn(LD_BUG, "Received a null pointer from caller to protover rust. "
log_warn(LD_BUG, "Received a null pointer from caller to rust. "
"This results in a memory leak due to not freeing the rust "
"string that was meant to be copied..");
return;
......
......@@ -85,7 +85,7 @@ protover_all_supported(const char *s, char **missing_out)
rust_str_ref_t missing_out_copy = NULL;
int is_supported = rust_protover_all_supported(s, &missing_out_copy);
if (!is_supported) {
if (!is_supported && missing_out_copy != NULL) {
move_rust_str_to_c_and_free(missing_out_copy, missing_out);
}
......
......@@ -24,6 +24,6 @@ pub fn c_tor_version_as_new_as(platform: &str, cutoff: &str) -> bool {
let result: c_int;
unsafe {
result = tor_version_as_new_as(c_platform.as_ptr(), c_cutoff.as_ptr());
result == 1
}
result == 1
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment