From 0bd220adcb82670893c85b1cc24d64e615855b4f Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Mon, 15 Sep 2014 14:04:19 -0400 Subject: Don't pass invalid memory regions to digestmap_set/get in test_routerlist Fixes bug in c887e20e6a5a2c17c65; bug in no released Tor version. --- src/test/test_routerset.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src/test/test_routerset.c') diff --git a/src/test/test_routerset.c b/src/test/test_routerset.c index 0ea1ef2d89..81e4dbb1eb 100644 --- a/src/test/test_routerset.c +++ b/src/test/test_routerset.c @@ -775,10 +775,11 @@ NS(test_main)(void *arg) { routerset_t *set = routerset_new(); int contains; + uint8_t foo[20] = { 2, 3, 4 }; (void)arg; - digestmap_set(set->digests, "foo", (void *)1); - contains = routerset_contains(set, NULL, 0, NULL, "foo", 0); + digestmap_set(set->digests, (const char*)foo, (void *)1); + contains = routerset_contains(set, NULL, 0, NULL, (const char*)foo, 0); routerset_free(set); tt_int_op(contains, ==, 4); @@ -799,10 +800,12 @@ NS(test_main)(void *arg) { routerset_t *set = routerset_new(); int contains; + uint8_t bar[20] = { 9, 10, 11, 55 }; + uint8_t foo[20] = { 1, 2, 3, 4}; (void)arg; - digestmap_set(set->digests, "bar", (void *)1); - contains = routerset_contains(set, NULL, 0, NULL, "foo", 0); + digestmap_set(set->digests, (const char*)bar, (void *)1); + contains = routerset_contains(set, NULL, 0, NULL, (const char*)foo, 0); routerset_free(set); tt_int_op(contains, ==, 0); @@ -823,9 +826,10 @@ NS(test_main)(void *arg) { routerset_t *set = routerset_new(); int contains; + uint8_t bar[20] = { 9, 10, 11, 55 }; (void)arg; - digestmap_set(set->digests, "bar", (void *)1); + digestmap_set(set->digests, (const char*)bar, (void *)1); contains = routerset_contains(set, NULL, 0, NULL, NULL, 0); routerset_free(set); -- cgit v1.2.3-54-g00ecf