[tor-commits] [tor/maint-0.4.3] Fix a GCC 10.0.1 compilation warning.

nickm at torproject.org nickm at torproject.org
Tue May 5 17:57:13 UTC 2020


commit d7e166bd95411d3f5caa573e0293356bff78c481
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 30 22:56:31 2020 -0400

    Fix a GCC 10.0.1 compilation warning.
    
    Fixes 34077 for 0.4.1; bugfix on 0.4.0.3-alpha. (Specifically, GCC
    first gives this warning for 9eeff921ae7b786d960ea4286d5bba56)
---
 changes/bug34077                          | 3 +++
 src/feature/dirauth/shared_random_state.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug34077 b/changes/bug34077
new file mode 100644
index 000000000..29458bd9d
--- /dev/null
+++ 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
index b669e3836..58c203e20 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;
 }
 





More information about the tor-commits mailing list