From: David Goulet <dgoulet@torproject.org>
Date: Mon, 4 Jul 2016 15:33:41 +0000 (-0400)
Subject: sr: Remove useless code in disk_state_update()
X-Git-Tag: tor-0.2.9.1-alpha~76^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6de05d529dddebbdd7f9bcd36ca69d9a5e17d66;p=thirdparty%2Ftor.git

sr: Remove useless code in disk_state_update()

This patch also updates a comment in the same function for accuracy.

Found by Coverity issue 1362985. Partily fixes #19567.

Signed-off-by: David Goulet <dgoulet@torproject.org>
---

diff --git a/src/or/shared_random_state.c b/src/or/shared_random_state.c
index 73df9c43fb..870b992837 100644
--- a/src/or/shared_random_state.c
+++ b/src/or/shared_random_state.c
@@ -617,26 +617,24 @@ disk_state_update(void)
   /* Reset current disk state. */
   disk_state_reset();
 
-  /* First, update elements that we don't need to iterate over a list to
-   * construct something. */
+  /* First, update elements that we don't need to do a construction. */
   sr_disk_state->Version = sr_state->version;
   sr_disk_state->ValidUntil = sr_state->valid_until;
   sr_disk_state->ValidAfter = sr_state->valid_after;
 
   /* Shared random values. */
   next = &sr_disk_state->SharedRandValues;
-  *next = NULL;
   if (sr_state->previous_srv != NULL) {
     *next = line = tor_malloc_zero(sizeof(config_line_t));
     line->key = tor_strdup(dstate_prev_srv_key);
     disk_state_put_srv_line(sr_state->previous_srv, line);
+    /* Go to the next shared random value. */
     next = &(line->next);
   }
   if (sr_state->current_srv != NULL) {
     *next = line = tor_malloc_zero(sizeof(*line));
     line->key = tor_strdup(dstate_cur_srv_key);
     disk_state_put_srv_line(sr_state->current_srv, line);
-    next = &(line->next);
   }
 
   /* Parse the commits and construct config line(s). */