aboutsummaryrefslogtreecommitdiff
path: root/src/or/consdiff.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-04-24 09:33:55 -0400
committerNick Mathewson <nickm@torproject.org>2017-04-24 09:33:55 -0400
commit9ba10d714a8ae84864c4fe159f4d6780a93d168f (patch)
tree9fd2f78fac33138f165dafa135ad2e1bb26cb083 /src/or/consdiff.c
parent8ff2a8c0e2e5bc19de23adf131d726287319a276 (diff)
parenta16de7a7cff14e133e01f5605f4600c67de5d91f (diff)
downloadtor-9ba10d714a8ae84864c4fe159f4d6780a93d168f.tar.gz
tor-9ba10d714a8ae84864c4fe159f4d6780a93d168f.zip
Merge branch 'consdiff_numeric_squashed'
Diffstat (limited to 'src/or/consdiff.c')
-rw-r--r--src/or/consdiff.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/consdiff.c b/src/or/consdiff.c
index 15a614e0fe..c0fe979b60 100644
--- a/src/or/consdiff.c
+++ b/src/or/consdiff.c
@@ -757,6 +757,9 @@ get_linenum(const char **s, int *num_out)
{
int ok;
char *next;
+ if (!TOR_ISDIGIT(**s)) {
+ return -1;
+ }
*num_out = (int) tor_parse_long(*s, 10, 0, INT32_MAX, &ok, &next);
if (ok && next) {
*s = next;