summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/or/connection.c3
-rw-r--r--src/or/networkstatus.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/src/or/connection.c b/src/or/connection.c
index d379533494..0c970cc3b4 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -778,7 +778,8 @@ create_unix_sockaddr(const char *listenaddress, char **readable_address,
"Unix domain sockets not supported, yet we tried to create one.");
*len_out = 0;
tor_assert(0);
-};
+ return NULL;
+}
#endif /* HAVE_SYS_UN_H */
/** Warn that an accept or a connect has failed because we're running up
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 910b99c5c0..3646ee6844 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -1463,8 +1463,10 @@ networkstatus_get_latest_consensus_by_flavor(consensus_flavor_t f)
return current_ns_consensus;
else if (f == FLAV_MICRODESC)
return current_md_consensus;
- else
+ else {
tor_assert(0);
+ return NULL;
+ }
}
/** Return the most recent consensus that we have downloaded, or NULL if it is