nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 13:34:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix another int-to-ptr cast.

Browse Source
This commit is contained in:
Nick Mathewson 2015-05-29 14:09:11 -04:00
parent 10dd50dfcb
commit ba17968534
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/test/test_scheduler.c
View File

@ -38,9 +38,9 @@ static circuitmux_t *mock_ccm_tgt_1 = NULL;
static circuitmux_t *mock_ccm_tgt_2 = NULL; static circuitmux_t *mock_ccm_tgt_2 = NULL;
static circuitmux_t *mock_cgp_tgt_1 = NULL; static circuitmux_t *mock_cgp_tgt_1 = NULL;
static const circuitmux_policy_t *mock_cgp_val_1 = NULL; static circuitmux_policy_t *mock_cgp_val_1 = NULL;
static circuitmux_t *mock_cgp_tgt_2 = NULL; static circuitmux_t *mock_cgp_tgt_2 = NULL;
static const circuitmux_policy_t *mock_cgp_val_2 = NULL; static circuitmux_policy_t *mock_cgp_val_2 = NULL;
static int scheduler_compare_channels_mock_ctr = 0; static int scheduler_compare_channels_mock_ctr = 0;
static int scheduler_run_mock_ctr = 0; static int scheduler_run_mock_ctr = 0;
@ -457,13 +457,19 @@ test_scheduler_compare_channels(void *arg)
/* Configure circuitmux_get_policy() mock */ /* Configure circuitmux_get_policy() mock */
mock_cgp_tgt_1 = cm1; mock_cgp_tgt_1 = cm1;
mock_cgp_tgt_2 = cm2;
/* /*
* This is to test the different-policies case, which uses the policy * This is to test the different-policies case, which uses the policy
* cast to an intptr_t as an arbitrary but definite thing to compare. * cast to an intptr_t as an arbitrary but definite thing to compare.
*/ */
mock_cgp_val_1 = (const circuitmux_policy_t *)(1); mock_cgp_val_1 = tor_malloc_zero(16);
mock_cgp_tgt_2 = cm2; mock_cgp_val_2 = tor_malloc_zero(16);
mock_cgp_val_2 = (const circuitmux_policy_t *)(2); if ( ((intptr_t) mock_cgp_val_1) > ((intptr_t) mock_cgp_val_2) ) {
void *tmp = mock_cgp_val_1;
mock_cgp_val_1 = mock_cgp_val_2;
mock_cgp_val_2 = tmp;
}
MOCK(circuitmux_get_policy, circuitmux_get_policy_mock); MOCK(circuitmux_get_policy, circuitmux_get_policy_mock);
@ -483,6 +489,7 @@ test_scheduler_compare_channels(void *arg)
tt_int_op(result, ==, 1); tt_int_op(result, ==, 1);
/* Distinct channels, same policy */ /* Distinct channels, same policy */
tor_free(mock_cgp_val_2);
mock_cgp_val_2 = mock_cgp_val_1; mock_cgp_val_2 = mock_cgp_val_1;
result = scheduler_compare_channels(&c1, &c2); result = scheduler_compare_channels(&c1, &c2);
tt_int_op(result, ==, -1); tt_int_op(result, ==, -1);
@ -497,13 +504,17 @@ test_scheduler_compare_channels(void *arg)
UNMOCK(circuitmux_get_policy); UNMOCK(circuitmux_get_policy);
mock_cgp_tgt_1 = NULL; mock_cgp_tgt_1 = NULL;
mock_cgp_val_1 = NULL;
mock_cgp_tgt_2 = NULL; mock_cgp_tgt_2 = NULL;
mock_cgp_val_2 = NULL;
tor_free(cm1); tor_free(cm1);
tor_free(cm2); tor_free(cm2);
if (mock_cgp_val_1 != mock_cgp_val_2)
tor_free(mock_cgp_val_1);
tor_free(mock_cgp_val_2);
mock_cgp_val_1 = NULL;
mock_cgp_val_2 = NULL;
return; return;
} }