Browse Source

Don't initialize desc stats for non-bridgedirauth nodes

Also make sure that calling rep_hist_note_desc_served() while stats
aren't initialized just returns.

Bug spotted by SwissTorHelp. Thanks!
Sebastian Hahn 12 years ago
parent
commit
f885c60501
2 changed files with 4 additions and 1 deletions
  1. 2 1
      src/or/config.c
  2. 2 0
      src/or/rephist.c

+ 2 - 1
src/or/config.c

@@ -1578,7 +1578,8 @@ options_act(const or_options_t *old_options)
         options->ConnDirectionStatistics) {
       rep_hist_conn_stats_init(now);
     }
-    if (!old_options || !old_options->BridgeAuthoritativeDir) {
+    if ((!old_options || !old_options->BridgeAuthoritativeDir) &&
+        options->BridgeAuthoritativeDir) {
       rep_hist_desc_stats_init(now);
       print_notice = 1;
     }

+ 2 - 0
src/or/rephist.c

@@ -2712,6 +2712,8 @@ rep_hist_desc_stats_write(time_t now)
 void
 rep_hist_note_desc_served(const char * desc)
 {
+  if (!served_descs)
+    return; // We're not collecting stats
   digestmap_set(served_descs, desc, (void *)1);
   total_descriptor_downloads++;
 }