torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

On bwhist state load failure, clear dir_read/write hist too

Browse Source
This commit is contained in:
Nick Mathewson
2011-01-10 13:15:51 -05:00
parent 7e1502c0d1
commit 28844c8403
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/1863_bwhist
+5
View File
@@ -3,3 +3,8 @@
triggered if a future version of Tor ever changed the timing
granularity at which bandwidth history is measured. Bugfix on
Tor 0.1.1.11-alpha.
- Correctly clear out dir_read/dir_write history when there is an
error parsing any bw history value from the state file. Bugfix on
Tor 0.2.2.15-alpha.
src/or/rephist.c
+7 -6
View File
@@ -1293,10 +1293,15 @@ static bw_array_t *dir_read_array = NULL;
directory protocol. */
static bw_array_t *dir_write_array = NULL;
/** Set up [dir-]read_array and [dir-]write_array. */
/** Set up [dir-]read_array and [dir-]write_array, freeing them if they alrady
* exist. */
static void
bw_arrays_init(void)
{
tor_free(read_array);
tor_free(write_array);
tor_free(dir_read_array);
tor_free(dir_write_array);
read_array = bw_array_new();
write_array = bw_array_new();
dir_read_array = bw_array_new();
@@ -1627,11 +1632,7 @@ rep_hist_load_state(or_state_t *state, char **err)
if (!all_ok) {
*err = tor_strdup("Parsing of bandwidth history values failed");
/* and create fresh arrays */
tor_free(read_array);
tor_free(write_array);
read_array = bw_array_new();
write_array = bw_array_new();
bw_arrays_init();
return -1;
}
return 0;