nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 20:33:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug29706_029_minimal' into bug29706_034_minimal_merge

Browse Source
This commit is contained in:
teor 2019-03-18 11:27:59 +10:00
commit 1d0146e2a2
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
4 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug29706_minimal Normal file
View File

@ -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.

4
src/or/dirauth/shared_random_state.c
View File

@ -971,7 +971,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 /* Delete the current SRV value from the state freeing it and the value is set
* to NULL meaning empty. */ * to NULL meaning empty. */
static void STATIC void
state_del_current_srv(void) state_del_current_srv(void)
{ {
state_query(SR_STATE_ACTION_DEL, SR_STATE_OBJ_CURSRV, NULL, NULL); state_query(SR_STATE_ACTION_DEL, SR_STATE_OBJ_CURSRV, NULL, NULL);
@ -979,7 +979,7 @@ state_del_current_srv(void)
/* Delete the previous SRV value from the state freeing it and the value is /* Delete the previous SRV value from the state freeing it and the value is
* set to NULL meaning empty. */ * set to NULL meaning empty. */
static void STATIC void
state_del_previous_srv(void) state_del_previous_srv(void)
{ {
state_query(SR_STATE_ACTION_DEL, SR_STATE_OBJ_PREVSRV, NULL, NULL); state_query(SR_STATE_ACTION_DEL, SR_STATE_OBJ_PREVSRV, NULL, NULL);

2
src/or/dirauth/shared_random_state.h
View File

@ -140,6 +140,8 @@ STATIC int is_phase_transition(sr_phase_t next_phase);
STATIC void set_sr_phase(sr_phase_t phase); STATIC void set_sr_phase(sr_phase_t phase);
STATIC sr_state_t *get_sr_state(void); STATIC sr_state_t *get_sr_state(void);
STATIC void state_del_previous_srv(void);
STATIC void state_del_current_srv(void);
#endif /* defined(TOR_UNIT_TESTS) */ #endif /* defined(TOR_UNIT_TESTS) */

17
src/test/test_shared_random.c
View File

@ -60,6 +60,9 @@ init_authority_state(void)
* the phase we are currently in which uses "now" as the starting * the phase we are currently in which uses "now" as the starting
* timestamp. Delete it before we do any testing below. */ * timestamp. Delete it before we do any testing below. */
sr_state_delete_commits(); sr_state_delete_commits();
/* It's also possible that a current SRV has been generated, if we are at
* state transition time. But let's just forget about that SRV. */
sr_state_clean_srvs();
done: done:
UNMOCK(get_my_v3_authority_cert); UNMOCK(get_my_v3_authority_cert);
@ -544,12 +547,20 @@ test_encoding(void *arg)
; ;
} }
/** Setup some SRVs in our SR state. If <b>also_current</b> is set, then set /** Setup some SRVs in our SR state.
* both current and previous SRVs. * If <b>also_current</b> is set, then set both current and previous SRVs.
* Helper of test_vote() and test_sr_compute_srv(). */ * Otherwise, just set the previous SRV. (And clear the current SRV.)
*
* You must call sr_state_free() to free the state at the end of each test
* function (on pass or fail). */
static void static void
test_sr_setup_srv(int also_current) test_sr_setup_srv(int also_current)
{ {
/* Clear both SRVs before starting.
* In 0.3.5 and earlier, sr_state_set_previous_srv() and
* sr_state_set_current_srv() do not free() the old srvs. */
sr_state_clean_srvs();
sr_srv_t *srv = tor_malloc_zero(sizeof(sr_srv_t)); sr_srv_t *srv = tor_malloc_zero(sizeof(sr_srv_t));
srv->num_reveals = 42; srv->num_reveals = 42;
memcpy(srv->value, memcpy(srv->value,