[tor-commits] [tor/master] Correctly handle machines out of tokens that have not closed yet.

[nickm at torproject.org]

commit 9b582edddb3a56d0eb2049820c6e14bfead7b143
Author: George Kadianakis <desnacked at riseup.net>
Date:   Wed Apr 17 13:23:23 2019 +0300

    Correctly handle machines out of tokens that have not closed yet.
    
    Perhaps the machine on the other side is still not done.
---
 src/core/or/circuitpadding.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c
index c0caacf58..e02cfb7bc 100644
--- a/src/core/or/circuitpadding.c
+++ b/src/core/or/circuitpadding.c
@@ -605,6 +605,11 @@ circpad_machine_sample_delay(circpad_machine_runtime_t *mi)
     histogram_total_tokens = state->histogram_total_tokens;
   }
 
+  /* If we are out of tokens, don't schedule padding. */
+  if (!histogram_total_tokens) {
+    return CIRCPAD_DELAY_INFINITE;
+  }
+
   bin_choice = crypto_fast_rng_get_uint64(get_thread_fast_rng(),
                                           histogram_total_tokens);