Unverified Commit c7fc53c2 authored by teor's avatar teor
Browse files

Merge branch 'bug30781_040' into bug30781_master

parents 3c2b2f07 fb3f4614

changes/bug30781

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  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.

src/feature/dirparse/routerparse.c

+3 −0
Original line number Diff line number Diff line
@@ -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;

  }