[tor-commits] [tor/master] test_token_bucket: negate after casting to signed type.

asn at torproject.org asn at torproject.org
Mon Aug 19 15:05:04 UTC 2019


commit 484b6540480ee4fdbc7a105242c897cca6d9d8eb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 6 11:42:04 2019 -0400

    test_token_bucket: negate after casting to signed type.
    
    Previously we tried multiplying by -1 before casting to int32_t,
    which would cause us to cast the -1 to an unsigned before we
    multiplied.  This gave us compiler warnings on windows.
    
    Fixes bug 31353; bug not in any released Tor.
---
 src/test/test_token_bucket.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/test_token_bucket.c b/src/test/test_token_bucket.c
index d3ce59138..31670718d 100644
--- a/src/test/test_token_bucket.c
+++ b/src/test/test_token_bucket.c
@@ -93,7 +93,7 @@ test_token_bucket_ctr_dec(void *arg)
 
   /* Keep underflowing shouldn't flag the bucket as empty. */
   tt_uint_op(false, OP_EQ, token_bucket_ctr_dec(&tb, BURST));
-  tt_int_op(tb.counter.bucket, OP_EQ, (int32_t) ((BURST + 1) * -1));
+  tt_int_op(tb.counter.bucket, OP_EQ, - (int32_t) (BURST + 1));
 
  done:
   ;





More information about the tor-commits mailing list