[or-cvs] [tor/release-0.2.2] Avoid sketchy integer cast in cbt code

arma at torproject.org arma at torproject.org
Sat Feb 12 10:03:03 UTC 2011


commit 9a4b2ec764de7ff49931a4ea561febada728d9b3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 25 17:27:25 2011 -0500

    Avoid sketchy integer cast in cbt code
    
    When calling circuit_build_times_shuffle_and_store_array, we were
    passing a uint32_t as an int.  arma is pretty sure that this can't
    actually cause a bug, because of checks elsewhere in the code, but
    it's best not to pass a uint32_t as an int anyway.
    
    Found by doorss; fix on 0.2.2.4-alpha.
---
 src/or/circuitbuild.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 3788959..5c9c1ac 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -588,9 +588,9 @@ circuit_build_times_update_state(circuit_build_times_t *cbt,
 static void
 circuit_build_times_shuffle_and_store_array(circuit_build_times_t *cbt,
                                             build_time_t *raw_times,
-                                            int num_times)
+                                            uint32_t num_times)
 {
-  int n = num_times;
+  uint32_t n = num_times;
   if (num_times > CBT_NCIRCUITS_TO_OBSERVE) {
     log_notice(LD_CIRC, "Decreasing circuit_build_times size from %d to %d",
                num_times, CBT_NCIRCUITS_TO_OBSERVE);





More information about the tor-commits mailing list