[tor-commits] [tor/master] Add an assertion to num_ntors_per_tap().

[asn at torproject.org]

commit 66b07e7ec13feb57d696b920493590d232e62763
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 11 18:38:59 2019 -0400

    Add an assertion to num_ntors_per_tap().
    
    This should please coverity, and fix CID 1415721.  It didn't
    understand that networkstatus_get_param() always returns a value
    between its minimum and maximum values.
---
 src/feature/relay/onion_queue.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/feature/relay/onion_queue.c b/src/feature/relay/onion_queue.c
index 696905cf5..c37745cf3 100644
--- a/src/feature/relay/onion_queue.c
+++ b/src/feature/relay/onion_queue.c
@@ -212,10 +212,12 @@ num_ntors_per_tap(void)
 #define MIN_NUM_NTORS_PER_TAP 1
 #define MAX_NUM_NTORS_PER_TAP 100000
 
-  return networkstatus_get_param(NULL, "NumNTorsPerTAP",
-                                 DEFAULT_NUM_NTORS_PER_TAP,
-                                 MIN_NUM_NTORS_PER_TAP,
-                                 MAX_NUM_NTORS_PER_TAP);
+  int result = networkstatus_get_param(NULL, "NumNTorsPerTAP",
+                                       DEFAULT_NUM_NTORS_PER_TAP,
+                                       MIN_NUM_NTORS_PER_TAP,
+                                       MAX_NUM_NTORS_PER_TAP);
+  tor_assert(result > 0);
+  return result;
 }
 
 /** Choose which onion queue we'll pull from next. If one is empty choose