Commit 3d515455 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge remote-tracking branch 'public/bug10409_023' into maint-0.2.4

parents 59f50c80 d8cfa2ef

changes/bug10409

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Minor bugfixes:

    - Avoid a crash bug when starting with a corrupted microdescriptor

      cache file. Fix for bug 10406; bugfix on 0.2.2.6-alpha.

src/or/dirvote.c

+2 −1
Original line number Diff line number Diff line
@@ -3585,7 +3585,8 @@ dirvote_create_microdescriptor(const routerinfo_t *ri, int consensus_method) 


  {

    smartlist_t *lst = microdescs_parse_from_string(output,

                                                 output+strlen(output), 0, 1);

                                                 output+strlen(output), 0,

                                                    SAVED_NOWHERE);

    if (smartlist_len(lst) != 1) {

      log_warn(LD_DIR, "We generated a microdescriptor we couldn't parse.");

      SMARTLIST_FOREACH(lst, microdesc_t *, md, microdesc_free(md));

src/or/microdesc.c

+1 −2
Original line number Diff line number Diff line
@@ -154,11 +154,10 @@ microdescs_add_to_cache(microdesc_cache_t *cache, 
{

  smartlist_t *descriptors, *added;

  const int allow_annotations = (where != SAVED_NOWHERE);

  const int copy_body = (where != SAVED_IN_CACHE);



  descriptors = microdescs_parse_from_string(s, eos,

                                             allow_annotations,

                                             copy_body);

                                             where);

  if (listed_at > 0) {

    SMARTLIST_FOREACH(descriptors, microdesc_t *, md,

                      md->last_listed = listed_at);

src/or/routerparse.c

+10 −3
Original line number Diff line number Diff line
@@ -4245,12 +4245,17 @@ find_start_of_next_microdesc(const char *s, const char *eos) 


/** Parse as many microdescriptors as are found from the string starting at

 * <b>s</b> and ending at <b>eos</b>.  If allow_annotations is set, read any

 * annotations we recognize and ignore ones we don't.  If <b>copy_body</b> is

 * true, then strdup the bodies of the microdescriptors.  Return all newly

 * annotations we recognize and ignore ones we don't.

 *

 * If <b>saved_location</b> isn't SAVED_IN_CACHE, make a local copy of each

 * descriptor in the body field of each microdesc_t.

 *

 * Return all newly

 * parsed microdescriptors in a newly allocated smartlist_t. */

smartlist_t *

microdescs_parse_from_string(const char *s, const char *eos,

                             int allow_annotations, int copy_body)

                             int allow_annotations,

                             saved_location_t where)

{

  smartlist_t *tokens;

  smartlist_t *result;
@@ -4259,6 +4264,7 @@ microdescs_parse_from_string(const char *s, const char *eos, 
  const char *start = s;

  const char *start_of_next_microdesc;

  int flags = allow_annotations ? TS_ANNOTATIONS_OK : 0;

  const int copy_body = (where != SAVED_IN_CACHE);



  directory_token_t *tok;
@@ -4288,6 +4294,7 @@ microdescs_parse_from_string(const char *s, const char *eos, 
      tor_assert(cp);



      md->bodylen = start_of_next_microdesc - cp;

      md->saved_location = where;

      if (copy_body)

        md->body = tor_memdup_nulterm(cp, md->bodylen);

      else

src/or/routerparse.h

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ ns_detached_signatures_t *networkstatus_parse_detached_signatures( 


smartlist_t *microdescs_parse_from_string(const char *s, const char *eos,

                                          int allow_annotations,

                                          int copy_body);

                                          saved_location_t where);



authority_cert_t *authority_cert_parse_from_string(const char *s,

                                                   const char **end_of_string);