nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cover the error cases of parsing protocol versions

Browse Source 
Also, detect an additional failure type. Thanks, tests!

(How distinctly I recall thee)
This commit is contained in:
Nick Mathewson 2016-08-23 14:02:48 -04:00
parent 0697e413ef
commit a232161f7b
2 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/or/protover.c
View File

@ -39,8 +39,10 @@ protocol_type_to_str(protocol_type_t pr)
if (PROTOCOL_NAMES[i].protover_type == pr)
return PROTOCOL_NAMES[i].name;
}
/* LCOV_EXCL_START */
tor_assert_nonfatal_unreached_once();
return "UNKNOWN";
/* LCOV_EXCL_STOP */
}
/**
@ -150,6 +152,10 @@ parse_single_entry(const char *s, const char *end_of_entry)
if (!equals)
goto error;
/* The name must be nonempty */
if (equals == s)
goto error;
out->name = tor_strndup(s, equals-s);
tor_assert(equals < end_of_entry);
@ -388,7 +394,7 @@ contract_protocol_list(const smartlist_t *proto_strings)
SMARTLIST_FOREACH_BEGIN(proto_strings, const char *, s) {
proto_entry_t *ent = parse_single_entry(s, s+strlen(s));
if (BUG(!ent))
continue;
continue; // LCOV_EXCL_LINE
smartlist_t *lst = strmap_get(entry_lists_by_name, ent->name);
if (!lst) {
smartlist_add(all_names, ent->name);
@ -591,11 +597,11 @@ protocol_list_contains(const smartlist_t *protos,
protocol_type_t pr, uint32_t ver)
{
if (BUG(protos == NULL)) {
return 0;
return 0; // LCOV_EXCL_LINE
}
const char *pr_name = protocol_type_to_str(pr);
if (BUG(pr_name == NULL)) {
return 0;
return 0; // LCOV_EXCL_LINE
}
SMARTLIST_FOREACH_BEGIN(protos, const proto_entry_t *, ent) {

36
src/test/test_protover.c
View File

@ -80,6 +80,41 @@ test_protover_parse(void *arg)
tor_free(re_encoded);
}
static void
test_protover_parse_fail(void *arg)
{
(void)arg;
smartlist_t *elts;
/* random junk */
elts = parse_protocol_list("!!3@*");
tt_assert(elts == NULL);
/* Missing equals sign in an entry */
elts = parse_protocol_list("Link=4 Haprauxymatyve Desc=9");
tt_assert(elts == NULL);
/* Missing word. */
elts = parse_protocol_list("Link=4 =3 Desc=9");
tt_assert(elts == NULL);
/* Broken numbers */
elts = parse_protocol_list("Link=fred");
tt_assert(elts == NULL);
elts = parse_protocol_list("Link=1,fred");
tt_assert(elts == NULL);
elts = parse_protocol_list("Link=1,fred,3");
tt_assert(elts == NULL);
/* Broken range */
elts = parse_protocol_list("Link=1,9-8,3");
tt_assert(elts == NULL);
done:
;
}
static void
test_protover_vote(void *arg)
{
@ -154,6 +189,7 @@ test_protover_all_supported(void *arg)
struct testcase_t protover_tests[] = {
PV_TEST(parse, 0),
PV_TEST(parse_fail, 0),
PV_TEST(vote, 0),
PV_TEST(all_supported, 0),
END_OF_TESTCASES