aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-06-11 08:41:55 -0400
committerNick Mathewson <nickm@torproject.org>2019-06-11 08:41:55 -0400
commiteb02c323eb2e4b5db5039502be9fd93c0fd19d84 (patch)
tree2f1afeb213b7bf12d2d1f8bb1271665f829e04b3 /src
parenta7986755eee19b948c46f0b43ad3f6174071bd79 (diff)
parent29842f68e7a4f38d69509191fba9a7ffb28cdcd8 (diff)
downloadtor-eb02c323eb2e4b5db5039502be9fd93c0fd19d84.tar.gz
tor-eb02c323eb2e4b5db5039502be9fd93c0fd19d84.zip
Merge branch 'maint-0.4.1'
Diffstat (limited to 'src')
-rw-r--r--src/feature/dirparse/routerparse.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/feature/dirparse/routerparse.c b/src/feature/dirparse/routerparse.c
index ff7e15f1f2..f78c46f186 100644
--- a/src/feature/dirparse/routerparse.c
+++ b/src/feature/dirparse/routerparse.c
@@ -556,6 +556,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;
}