Commit 50cc49dd authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Merge branch 'maint-0.3.0' into release-0.3.0

parents 4da0fe02 4c21d4ef

changes/bug21507

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

    - Reject version numbers with non-numeric prefixes (such as +, -, and

      whitespace). Disallowing whitespace prevents differential version

      parsing between POSIX-based and Windows platforms.

      Fixes bug 21507 and part of 21508; bugfix on 0.0.8pre1.

src/or/routerparse.c

+2 −0
Original line number Diff line number Diff line
@@ -4894,6 +4894,8 @@ tor_version_parse(const char *s, tor_version_t *out) 


#define NUMBER(m)                               \

  do {                                          \

    if (!cp || *cp < '0' || *cp > '9')          \

      return -1;                                \

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

    if (!ok)                                    \

      return -1;                                \