From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 11 Jan 2018 16:31:03 +0000 (-0500)
Subject: Compute flavor name before dereference, to avoid a STACK warning.
X-Git-Tag: tor-0.3.3.1-alpha~39^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=81aec1449b2c765c395c9f5920c287500e747488;p=thirdparty%2Ftor.git

Compute flavor name before dereference, to avoid a STACK warning.

(See 24423)
---

diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index deef62bd40..aa0a8d15c3 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -2077,6 +2077,7 @@ networkstatus_note_certs_arrived(const char *source_dir)
 {
   int i;
   for (i=0; i<N_CONSENSUS_FLAVORS; ++i) {
+    const char *flavor_name = networkstatus_get_flavor_name(i);
     consensus_waiting_for_certs_t *waiting = &consensus_waiting_for_certs[i];
     if (!waiting->consensus)
       continue;
@@ -2084,7 +2085,7 @@ networkstatus_note_certs_arrived(const char *source_dir)
       char *waiting_body = waiting->body;
       if (!networkstatus_set_current_consensus(
                                  waiting_body,
-                                 networkstatus_get_flavor_name(i),
+                                 flavor_name,
                                  NSSET_WAS_WAITING_FOR_CERTS,
                                  source_dir)) {
         tor_free(waiting_body);