tor

commit bbfc498e21c9854b16b0543bf3f3f4ac304711f7
parent 2d34d4d1af5395885780ee96fbedb0bf17fb0f44
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon,  4 May 2020 10:25:52 -0400

Merge branch 'maint-0.4.1' into maint-0.4.2

Diffstat:
A
changes/bug34077
 | 
3
+++
M
src/feature/dirauth/shared_random_state.c
 | 
3
++-

2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/changes/bug34077 b/changes/bug34077
@@ -0,0 +1,3 @@
+  o Minor bugfixes (compiler warnings):
+    - Fix compilation warnings with GCC 10.0.1. Fixes bug 34077; bugfix on
+      0.4.0.3-alpha.
diff --git a/src/feature/dirauth/shared_random_state.c b/src/feature/dirauth/shared_random_state.c
@@ -1066,8 +1066,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;
 }