Merge remote-tracking branch 'origin/maint-0.2.2'

Conflicts:
	src/common/util.c
	src/test/test_util.c

1 files changed, 9 insertions, 0 deletions

diff --git a/src/common/util.c b/src/common/util.c
index 276c6dd13..30bf6879a 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -870,6 +870,9 @@ tor_digest256_is_zero(const char *digest)
 /* Helper: common code to check whether the result of a strtol or strtoul or
  * strtoll is correct. */
 #define CHECK_STRTOX_RESULT()                           \
+  /* Did an overflow occur? */                          \
+  if (errno == ERANGE)                                  \
+    goto err;                                           \
   /* Was at least one character converted? */           \
   if (endptr == s)                                      \
     goto err;                                           \
@@ -911,6 +914,8 @@ tor_parse_long(const char *s, int base, long min, long max,
       *ok = 0;
     return 0;
   }
+
+  errno = 0;
   r = strtol(s, &endptr, base);
   CHECK_STRTOX_RESULT();
 }
@@ -928,6 +933,8 @@ tor_parse_ulong(const char *s, int base, unsigned long min,
       *ok = 0;
     return 0;
   }
+
+  errno = 0;
   r = strtoul(s, &endptr, base);
   CHECK_STRTOX_RESULT();
 }
@@ -939,6 +946,7 @@ tor_parse_double(const char *s, double min, double max, int *ok, char **next)
   char *endptr;
   double r;
 
+  errno = 0;
   r = strtod(s, &endptr);
   CHECK_STRTOX_RESULT();
 }
@@ -958,6 +966,7 @@ tor_parse_uint64(const char *s, int base, uint64_t min,
     return 0;
   }
 
+  errno = 0;
 #ifdef HAVE_STRTOULL
   r = (uint64_t)strtoull(s, &endptr, base);
 #elif defined(_WIN32)