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

asn at torproject.org asn at torproject.org
Thu Apr 18 10:23:55 UTC 2019


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

    Add an assertion to pathbias_get_scale_ratio()
    
    This should please coverity, and fix CID 1415723.  It didn't understand
    that networkstatus_get_param() always returns a value between its
    minimum and maximum values.
---
 src/feature/client/circpathbias.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/feature/client/circpathbias.c b/src/feature/client/circpathbias.c
index 1743ab5a8..e6af649ba 100644
--- a/src/feature/client/circpathbias.c
+++ b/src/feature/client/circpathbias.c
@@ -176,6 +176,7 @@ pathbias_get_scale_threshold(const or_options_t *options)
 static double
 pathbias_get_scale_ratio(const or_options_t *options)
 {
+  (void) options;
   /*
    * The scale factor is the denominator for our scaling
    * of circuit counts for our path bias window.
@@ -185,7 +186,8 @@ pathbias_get_scale_ratio(const or_options_t *options)
    */
   int denominator = networkstatus_get_param(NULL, "pb_scalefactor",
                               2, 2, INT32_MAX);
-  (void) options;
+  tor_assert(denominator > 0);
+
   /**
    * The mult factor is the numerator for our scaling
    * of circuit counts for our path bias window. It





More information about the tor-commits mailing list