diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-06-13 10:13:01 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-06-13 10:13:01 -0400 |
| commit | 971cf123743693677ab1b480692d117e333cb882 (patch) | |
| tree | 17b1601a7f9598dd4c0739aaec3d505bfe60b26f | |
| parent | 068046eebc73fbe1f0d8419f0dfea65d3de9c14a (diff) | |
| parent | 2133b6e5ba0985aa7810edf2d9973470bc4c19da (diff) | |
| download | tor-971cf123743693677ab1b480692d117e333cb882.tar.gz tor-971cf123743693677ab1b480692d117e333cb882.zip | |
Merge branch 'task-5849-3-squashed'
| -rw-r--r-- | changes/bug5849 | 3 | ||||
| -rw-r--r-- | src/or/rephist.c | 14 |
2 files changed, 11 insertions, 6 deletions
diff --git a/changes/bug5849 b/changes/bug5849 new file mode 100644 index 0000000000..b6738a6b99 --- /dev/null +++ b/changes/bug5849 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Fix a (harmless) integer overflow in cell statistics reported by + some fast relays. Fixes bug 5849; bugfix on 0.2.2.1-alpha. diff --git a/src/or/rephist.c b/src/or/rephist.c index ec5b84692e..341a5a3e98 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -2478,8 +2478,9 @@ char * rep_hist_format_buffer_stats(time_t now) { #define SHARES 10 - int processed_cells[SHARES], circs_in_share[SHARES], - number_of_circuits, i; + uint64_t processed_cells[SHARES]; + uint32_t circs_in_share[SHARES]; + int number_of_circuits, i; double queued_cells[SHARES], time_in_queue[SHARES]; smartlist_t *processed_cells_strings, *queued_cells_strings, *time_in_queue_strings; @@ -2494,8 +2495,8 @@ rep_hist_format_buffer_stats(time_t now) tor_assert(now >= start_of_buffer_stats_interval); /* Calculate deciles if we saw at least one circuit. */ - memset(processed_cells, 0, SHARES * sizeof(int)); - memset(circs_in_share, 0, SHARES * sizeof(int)); + memset(processed_cells, 0, SHARES * sizeof(uint64_t)); + memset(circs_in_share, 0, SHARES * sizeof(uint32_t)); memset(queued_cells, 0, SHARES * sizeof(double)); memset(time_in_queue, 0, SHARES * sizeof(double)); if (!circuits_for_buffer_stats) @@ -2523,8 +2524,9 @@ rep_hist_format_buffer_stats(time_t now) time_in_queue_strings = smartlist_new(); for (i = 0; i < SHARES; i++) { smartlist_add_asprintf(processed_cells_strings, - "%d", !circs_in_share[i] ? 0 : - processed_cells[i] / circs_in_share[i]); + U64_FORMAT, !circs_in_share[i] ? 0 : + U64_PRINTF_ARG(processed_cells[i] / + circs_in_share[i])); } for (i = 0; i < SHARES; i++) { smartlist_add_asprintf(queued_cells_strings, "%.2f", |