diff options
| author | teor <teor@torproject.org> | 2019-03-09 10:50:07 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-03-09 11:59:52 +1000 |
| commit | 9400da9b5e44bfce0684a3b36edb37465be514d6 (patch) | |
| tree | 225a19812f54374069aa0b45cff53cf132ab2459 | |
| parent | 2e74edb53ef9ac417d8424a0785af839f83791ca (diff) | |
| download | tor-9400da9b5e44bfce0684a3b36edb37465be514d6.tar.gz tor-9400da9b5e44bfce0684a3b36edb37465be514d6.zip | |
test/sr: Free SRVs before replacing them in test_sr_setup_srv()
Stop leaking parts of the shared random state in the shared-random unit
tests. The previous fix in 29599 was incomplete.
Fixes bug 29706; bugfix on 0.2.9.1-alpha.
| -rw-r--r-- | changes/bug29706_minimal | 4 | ||||
| -rw-r--r-- | src/or/shared_random_state.c | 4 | ||||
| -rw-r--r-- | src/or/shared_random_state.h | 2 | ||||
| -rw-r--r-- | src/test/test_shared_random.c | 4 |
4 files changed, 12 insertions, 2 deletions
diff --git a/changes/bug29706_minimal b/changes/bug29706_minimal new file mode 100644 index 0000000000..9d4a43326c --- /dev/null +++ b/changes/bug29706_minimal @@ -0,0 +1,4 @@ + o Minor bugfixes (memory management, testing): + - Stop leaking parts of the shared random state in the shared-random unit + tests. The previous fix in 29599 was incomplete. + Fixes bug 29706; bugfix on 0.2.9.1-alpha. diff --git a/src/or/shared_random_state.c b/src/or/shared_random_state.c index 8438d46404..f27eccafc7 100644 --- a/src/or/shared_random_state.c +++ b/src/or/shared_random_state.c @@ -1007,7 +1007,7 @@ state_query(sr_state_action_t action, sr_state_object_t obj_type, /* Delete the current SRV value from the state freeing it and the value is set * to NULL meaning empty. */ -static void +STATIC void state_del_current_srv(void) { state_query(SR_STATE_ACTION_DEL, SR_STATE_OBJ_CURSRV, NULL, NULL); @@ -1015,7 +1015,7 @@ state_del_current_srv(void) /* Delete the previous SRV value from the state freeing it and the value is * set to NULL meaning empty. */ -static void +STATIC void state_del_previous_srv(void) { state_query(SR_STATE_ACTION_DEL, SR_STATE_OBJ_PREVSRV, NULL, NULL); diff --git a/src/or/shared_random_state.h b/src/or/shared_random_state.h index 43a7f1d284..cf027f2d35 100644 --- a/src/or/shared_random_state.h +++ b/src/or/shared_random_state.h @@ -140,6 +140,8 @@ STATIC int is_phase_transition(sr_phase_t next_phase); STATIC void set_sr_phase(sr_phase_t phase); STATIC sr_state_t *get_sr_state(void); +STATIC void state_del_previous_srv(void); +STATIC void state_del_current_srv(void); #endif /* TOR_UNIT_TESTS */ diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c index cebe772d94..0a3c2e119b 100644 --- a/src/test/test_shared_random.c +++ b/src/test/test_shared_random.c @@ -461,6 +461,8 @@ test_sr_setup_srv(int also_current) "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ", sizeof(srv->value)); + /* sr_state_set_previous_srv() does not free() the old previous srv. */ + state_del_previous_srv(); sr_state_set_previous_srv(srv); if (also_current) { @@ -470,6 +472,8 @@ test_sr_setup_srv(int also_current) "NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN", sizeof(srv->value)); + /* sr_state_set_previous_srv() does not free() the old current srv. */ + state_del_current_srv(); sr_state_set_current_srv(srv); } } |