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

[nickm@xxxxxxxxxxxxxx]

commit b1c383e3e65ec539ebe4394652429f1954e3d805
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Apr 30 23:04:56 2020 -0400

    Fix a GCC 10.0.1 compilation error.
    
    Do not try to stuff "HS_DESC_DECODE_GENERIC_ERROR" (-1) into a
    socks5_reply_status_t (enum).  It doesn't actually make sense, and
    isn't one of our documented extensions.
    
    (This can only happen on a nonfatal assertion that we haven't seen,
    so it probably isn't happening in practice.)
    
    Fixes another case of bug 34077; bugfix on 0.4.3.1-alpha.
---
 src/feature/hs/hs_client.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c
index da1202b64..68d6619ce 100644
--- a/src/feature/hs/hs_client.c
+++ b/src/feature/hs/hs_client.c
@@ -1350,7 +1350,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);
@@ -2493,4 +2493,3 @@ set_hs_client_auths_map(digest256map_t *map)
 }
 
 #endif /* defined(TOR_UNIT_TESTS) */
-



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits