Merge branch 'maint-0.2.9' into release-0.2.9
This commit is contained in:
commit
c06b5eb0e3
|
@ -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.
|
|
@ -5621,6 +5621,8 @@ tor_version_parse(const char *s, tor_version_t *out)
|
||||||
|
|
||||||
#define NUMBER(m) \
|
#define NUMBER(m) \
|
||||||
do { \
|
do { \
|
||||||
|
if (!cp || *cp < '0' || *cp > '9') \
|
||||||
|
return -1; \
|
||||||
out->m = (int)tor_parse_uint64(cp, 10, 0, INT32_MAX, &ok, &eos); \
|
out->m = (int)tor_parse_uint64(cp, 10, 0, INT32_MAX, &ok, &eos); \
|
||||||
if (!ok) \
|
if (!ok) \
|
||||||
return -1; \
|
return -1; \
|
||||||
|
|
Loading…
Reference in New Issue