[tor-commits] [tor/master] Do not add bw file line to the vote

[nickm@xxxxxxxxxxxxxx]

commit 086060e138d0fe5904a8b09d48bdcf9d8922af39
Author: juga0 <juga@xxxxxxxxxx>
Date:   Thu May 31 08:07:22 2018 +0000

    Do not add bw file line to the vote
    
    when there are not bw file headers lines.
---
 src/feature/dirauth/dirvote.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c
index 27d3a4841..a1bafb4fd 100644
--- a/src/feature/dirauth/dirvote.c
+++ b/src/feature/dirauth/dirvote.c
@@ -254,8 +254,7 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key,
     /* XXXX Abstraction violation: should be pulling a field out of v3_ns.*/
     char *flag_thresholds = dirserv_get_flag_thresholds_line();
     char *params;
-    char *bwlist_headers = smartlist_join_strings(v3_ns->bwlist_headers,
-                                                  " ", 0, NULL);
+    char *bwlist_headers;
     authority_cert_t *cert = v3_ns->cert;
     char *methods =
       make_consensus_method_list(MIN_SUPPORTED_CONSENSUS_METHOD,
@@ -270,6 +269,11 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key,
     else
       params = tor_strdup("");
     tor_assert(cert);
+    if (v3_ns->bwlist_headers)
+      bwlist_headers = smartlist_join_strings(v3_ns->bwlist_headers, " ", 0,
+                                              NULL);
+    else
+      bwlist_headers = tor_strdup("");
     smartlist_add_asprintf(chunks,
                  "network-status-version 3\n"
                  "vote-status %s\n"



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