[tor-commits] [tor/master] sr: Remove useless code in disk_state_update()

[nickm at torproject.org]

commit c6de05d529dddebbdd7f9bcd36ca69d9a5e17d66
Author: David Goulet <dgoulet at torproject.org>
Date:   Mon Jul 4 11:33:41 2016 -0400

    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 at torproject.org>
---
 src/or/shared_random_state.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/or/shared_random_state.c b/src/or/shared_random_state.c
index 73df9c4..870b992 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). */