Commit 24c740e5 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge commit 'sebastian/memleak' into maint-0.2.1

parents 113ba0e7 b792afa9

ChangeLog

+3 −0
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ Changes in version 0.2.1.20 - 2009-??-?? 
      patch. Bugfix on the 54th commit on Tor -- from July 2002,

      before the release of Tor 0.0.0. This is the new winner of the

      oldest-bug prize.

    - Fix a remotely triggerable memory leak when a consensus document

      contains more than one signature from the same voter. Bugfix on

      0.2.0.3-alpha.



  o New directory authorities:

    - Set up urras (run by Jacob Appelbaum) as the seventh v3 directory

src/or/routerparse.c

+8 −0
Original line number Diff line number Diff line
@@ -2509,6 +2509,14 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out, 
    } else {

      if (tok->object_size >= INT_MAX)

        goto err;

      /* We already parsed a vote from this voter. Use the first one. */

      if (v->signature) {

        log_fn(LOG_PROTOCOL_WARN, LD_DIR, "We received a networkstatus "

                   "that contains two votes from the same voter. Ignoring "

                   "the second vote.");

        continue;

      }



      v->signature = tor_memdup(tok->object_body, tok->object_size);

      v->signature_len = (int) tok->object_size;

    }