Browse Source

Merge branch 'bug17750_029_squashed'

Nick Mathewson 6 years ago
parent
commit
0ccdf2f31e
2 changed files with 7 additions and 1 deletions
  1. 4 0
      changes/bug22924
  2. 3 1
      src/test/test_dir.c

+ 4 - 0
changes/bug22924

@@ -0,0 +1,4 @@
+  o Minor bugfies (tests):
+    - Fix a signed-integer overflow in the unit tests for
+      dir/download_status_random_backoff, which was untriggered until we
+      fixed bug 17750.  Fixes bug 22924; bugfix on 0.2.9.1-alpha.

+ 3 - 1
src/test/test_dir.c

@@ -4164,12 +4164,14 @@ download_status_random_backoff_helper(int min_delay, int max_delay)
     }
 
     /* Advance */
-    current_time += increment;
     ++(dls_random.n_download_attempts);
     ++(dls_random.n_download_failures);
 
     /* Try another maybe */
     old_increment = increment;
+    if (increment >= max_delay)
+      current_time += increment;
+
   } while (increment < max_delay);
 
  done: