tor

commit f96b6ccee1945b2db32c858837ac21c6d81c820b
parent 6dc9930d3a14c30af0f285a884476f33a782938c
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon,  4 May 2020 10:25:53 -0400

Merge branch 'maint-0.4.3'

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

3 files changed, 6 insertions(+), 2 deletions(-)
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
@@ -1041,8 +1041,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;
 }
 
diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c
@@ -1435,7 +1435,7 @@ client_desc_missing_bad_client_auth(const smartlist_t *entry_conns,
       /* We should not be called with another type of status. Recover by
        * sending a generic error. */
       tor_assert_nonfatal_unreached();
-      code = HS_DESC_DECODE_GENERIC_ERROR;
+      code = SOCKS5_GENERAL_ERROR;
     }
     entry_conn->socks_request->socks_extended_error_code = code;
     connection_mark_unattached_ap(entry_conn, END_STREAM_REASON_MISC);