diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-02-03 15:50:31 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-02-03 15:50:31 -0500 |
| commit | 5be48c5d4c7339ab69b2becb6176c83d2f637f11 (patch) | |
| tree | c6fd462cc1222f113cd412642a6d39fa6287bd6a | |
| parent | cdc49629c7d26e9806b8aa3c5a7dc80fbec9d060 (diff) | |
| download | tor-5be48c5d4c7339ab69b2becb6176c83d2f637f11.tar.gz tor-5be48c5d4c7339ab69b2becb6176c83d2f637f11.zip | |
Work around test_status.c weirdness
Ordinarily, get_options() can never return NULL, but with
test_status.c mocking, it can. So test for that case.
The best fix here would be to pass the options value to a
bridge_server_mode() function.
| -rw-r--r-- | src/or/status.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/status.c b/src/or/status.c index 98db688e5b..8057abef16 100644 --- a/src/or/status.c +++ b/src/or/status.c @@ -132,7 +132,7 @@ log_heartbeat(time_t now) circuit_log_ancient_one_hop_circuits(1800); - if (options->BridgeRelay) { + if (options && options->BridgeRelay) { char *msg = NULL; msg = format_client_stats_heartbeat(now); if (msg) |