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 | 50cc49dd7f0929ece6dc116671790ad94ee6baba (patch) | |
| tree | 0b670a0df43c3636dc153376b11e38f2a7ea1a7c | |
| parent | 4da0fe0234f2a05d1f2221fc9a2cba0bc1d1cdfe (diff) | |
| parent | 4c21d4ef7ac0ba0b20ee60322ce177c5f965dc0e (diff) | |
| download | tor-50cc49dd7f0929ece6dc116671790ad94ee6baba.tar.gz tor-50cc49dd7f0929ece6dc116671790ad94ee6baba.zip | |
Merge branch 'maint-0.3.0' into release-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; \ |