From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 6 Aug 2019 15:42:04 +0000 (-0400)
Subject: test_token_bucket: negate after casting to signed type.
X-Git-Tag: tor-0.4.2.1-alpha~87^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=484b6540480ee4fdbc7a105242c897cca6d9d8eb;p=thirdparty%2Ftor.git

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.
---

diff --git a/src/test/test_token_bucket.c b/src/test/test_token_bucket.c
index d3ce591388..31670718d9 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:
   ;