diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-07-14 15:07:09 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-07-14 15:07:09 -0400 |
| commit | 0ccdf2f31e52bde1dc9556a4c938c494e784c79c (patch) | |
| tree | 5b92b703437ef60b2eb087cfe2e0207a2975c951 | |
| parent | 9a1338d9df938fba0c3e56e216dfe07237ed934b (diff) | |
| parent | b7566d465f0299e97b46f40d746a1203257245d4 (diff) | |
| download | tor-0ccdf2f31e52bde1dc9556a4c938c494e784c79c.tar.gz tor-0ccdf2f31e52bde1dc9556a4c938c494e784c79c.zip | |
Merge branch 'bug17750_029_squashed'
| -rw-r--r-- | changes/bug22924 | 4 | ||||
| -rw-r--r-- | src/test/test_dir.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/changes/bug22924 b/changes/bug22924 new file mode 100644 index 0000000000..e59fc724eb --- /dev/null +++ b/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. diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 5ed56696a3..e31917056e 100644 --- a/src/test/test_dir.c +++ b/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: |