diff options
| author | teor <teor@torproject.org> | 2019-06-06 09:12:14 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-06-06 09:51:24 +1000 |
| commit | ba83c1e5cf0e4ba0d63cb3728da059a9b241a161 (patch) | |
| tree | db66ebd29ca06f4382478cba34af06d63b73d2b4 | |
| parent | 4e262196a88d2a7d3be059d075f53a6f182b2773 (diff) | |
| download | tor-ba83c1e5cf0e4ba0d63cb3728da059a9b241a161.tar.gz tor-ba83c1e5cf0e4ba0d63cb3728da059a9b241a161.zip | |
dirparse: Stop crashing when parsing unknown descriptor purpose annotations
We think this bug can only be triggered by modifying a local file.
Fixes bug 30781; bugfix on 0.2.0.8-alpha.
| -rw-r--r-- | changes/bug30781 | 4 | ||||
| -rw-r--r-- | src/or/routerparse.c | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/changes/bug30781 b/changes/bug30781 new file mode 100644 index 0000000000..7c7adf470e --- /dev/null +++ b/changes/bug30781 @@ -0,0 +1,4 @@ + o Minor bugfixes (directory authorities): + - Stop crashing after parsing an unknown descriptor purpose annotation. + We think this bug can only be triggered by modifying a local file. + Fixes bug 30781; bugfix on 0.2.0.8-alpha. diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 37d2d975fc..f046cc39b4 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -1921,6 +1921,9 @@ router_parse_entry_from_string(const char *s, const char *end, if ((tok = find_opt_by_keyword(tokens, A_PURPOSE))) { tor_assert(tok->n_args); router->purpose = router_purpose_from_string(tok->args[0]); + if (router->purpose == ROUTER_PURPOSE_UNKNOWN) { + goto err; + } } else { router->purpose = ROUTER_PURPOSE_GENERAL; } |