Commit 62f98ad4 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'maint-0.2.9'

parents 1fbff411 cb6b3b7c

changes/bug21450

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (voting consistency):

    - Reject version numbers with components that exceed INT32_MAX.

      Otherwise 32-bit and 64-bit platforms would behave inconsistently.

      Fixes bug 21450; bugfix on 0.0.8pre1.

src/or/routerparse.c

+4 −1
Original line number Diff line number Diff line
@@ -4878,6 +4878,7 @@ tor_version_parse(const char *s, tor_version_t *out) 
{

  char *eos=NULL;

  const char *cp=NULL;

  int ok = 1;

  /* Format is:

   *   "Tor " ? NUM dot NUM [ dot NUM [ ( pre | rc | dot ) NUM ] ] [ - tag ]

   */
@@ -4893,7 +4894,9 @@ tor_version_parse(const char *s, tor_version_t *out) 


#define NUMBER(m)                               \

  do {                                          \

    out->m = (int)strtol(cp, &eos, 10);         \

    out->m = (int)tor_parse_uint64(val, 10, 0, INT32_MAX, &ok, &eos); \

    if (!ok)                                    \

      return -1;                                \

    if (!eos || eos == cp)                      \

      return -1;                                \

    cp = eos;                                   \