]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Avoid sketchy integer cast in cbt code
authorNick Mathewson <nickm@torproject.org>
Tue, 25 Jan 2011 22:27:25 +0000 (17:27 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 26 Jan 2011 16:05:21 +0000 (11:05 -0500)
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

index 37889595561ed42e00ff380c3f42df55925a11dc..5c9c1acf2515d81b63482f74046246d20669a33a 100644 (file)
@@ -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);