From: Alexander Færøy <ahf@torproject.org>
Date: Wed, 11 Jul 2018 14:19:56 +0000 (+0200)
Subject: Add checks in get_net_param_from_list() for valid output domain.
X-Git-Tag: tor-0.3.5.1-alpha~192^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c9de65f96685fd54029f284a043cefd970061956;p=thirdparty%2Ftor.git

Add checks in get_net_param_from_list() for valid output domain.

This patch adds two assertions in get_net_param_from_list() to ensure
that the `res` value is correctly within the range of the output domain.

Hopefully fixes Coverity CID #1415721, #1415722, and #1415723.

See: https://bugs.torproject.org/26780
---

diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c
index e9d36cbdcb..f8623f826c 100644
--- a/src/feature/nodelist/networkstatus.c
+++ b/src/feature/nodelist/networkstatus.c
@@ -2417,6 +2417,8 @@ get_net_param_from_list(smartlist_t *net_params, const char *param_name,
     res = max_val;
   }
 
+  tor_assert(res >= min_val);
+  tor_assert(res <= max_val);
   return res;
 }