diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-06-28 14:03:23 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-06-28 14:03:23 -0400 |
| commit | 4c21d4ef7ac0ba0b20ee60322ce177c5f965dc0e (patch) | |
| tree | 5121f7654492e8a904cd945fff75c716fc2c8b3d | |
| parent | aa5af6a238bc5f1cae548e416ada261b3a105d16 (diff) | |
| parent | ec9c6d77234809d5bdc06357100ca4bffbbec18c (diff) | |
| download | tor-4c21d4ef7ac0ba0b20ee60322ce177c5f965dc0e.tar.gz tor-4c21d4ef7ac0ba0b20ee60322ce177c5f965dc0e.zip | |
Merge branch 'maint-0.2.9' into maint-0.3.0
| -rw-r--r-- | changes/bug21507 | 5 | ||||
| -rw-r--r-- | src/or/routerparse.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/changes/bug21507 b/changes/bug21507 new file mode 100644 index 0000000000..f83e291b63 --- /dev/null +++ b/changes/bug21507 @@ -0,0 +1,5 @@ + 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. diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 98167d44f8..0336c035b4 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -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; \ |