From 56e0959d2ab9cae45d39c5b9d72b1bb1b8ad03b7 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 30 Mar 2012 10:34:05 -0400
Subject: [PATCH] Have tor_parse_*long functions check for negative bases

One of our unit tests checks that they behave correctly (giving an
error) when the base is negative.  But there isn't a guarantee that
strtol and friends actually handle negative bases correctly.

Found by Coverity Scan; fix for CID 504.
---
 src/common/util.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/common/util.c b/src/common/util.c
index 1807ee7adc..266368cc9d 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -906,6 +906,11 @@ tor_parse_long(const char *s, int base, long min, long max,
   char *endptr;
   long r;
 
+  if (base < 0) {
+    if (ok)
+      *ok = 0;
+    return 0;
+  }
   r = strtol(s, &endptr, base);
   CHECK_STRTOX_RESULT();
 }
@@ -918,6 +923,11 @@ tor_parse_ulong(const char *s, int base, unsigned long min,
   char *endptr;
   unsigned long r;
 
+  if (base < 0) {
+    if (ok)
+      *ok = 0;
+    return 0;
+  }
   r = strtoul(s, &endptr, base);
   CHECK_STRTOX_RESULT();
 }
@@ -942,6 +952,12 @@ tor_parse_uint64(const char *s, int base, uint64_t min,
   char *endptr;
   uint64_t r;
 
+  if (base < 0) {
+    if (ok)
+      *ok = 0;
+    return 0;
+  }
+
 #ifdef HAVE_STRTOULL
   r = (uint64_t)strtoull(s, &endptr, base);
 #elif defined(_WIN32)