aboutsummaryrefslogtreecommitdiff
path: root/src/feature
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-05-04 10:25:52 -0400
committerNick Mathewson <nickm@torproject.org>2020-05-04 10:25:52 -0400
commit73c4bdaad517a8b8a344a6f523960eea7268192f (patch)
treeb3eb97921132dcebc2cd5bf63021bff87d002860 /src/feature
parent1163d9a62fb40ecea50ff1279dcb55bcd7cced32 (diff)
parenta02e866642c28b4c0cbe415f8573c4ede4d9caf7 (diff)
downloadtor-73c4bdaad517a8b8a344a6f523960eea7268192f.tar.gz
tor-73c4bdaad517a8b8a344a6f523960eea7268192f.zip
Merge branch 'maint-0.4.1' into release-0.4.1
Diffstat (limited to 'src/feature')
-rw-r--r--src/feature/dirauth/shared_random_state.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/feature/dirauth/shared_random_state.c b/src/feature/dirauth/shared_random_state.c
index b669e3836e..58c203e204 100644
--- a/src/feature/dirauth/shared_random_state.c
+++ b/src/feature/dirauth/shared_random_state.c
@@ -1057,8 +1057,9 @@ sr_state_set_valid_after(time_t valid_after)
sr_phase_t
sr_state_get_phase(void)
{
- void *ptr;
+ void *ptr=NULL;
state_query(SR_STATE_ACTION_GET, SR_STATE_OBJ_PHASE, NULL, &ptr);
+ tor_assert(ptr);
return *(sr_phase_t *) ptr;
}