[tor-commits] [tor/master] Fix an always-false check with an assertion

[nickm@xxxxxxxxxxxxxx]

commit f4ded2cdc98f46817c381fc633e3161d52f75242
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Sep 1 09:52:46 2015 -0400

    Fix an always-false check with an assertion
    
    In validate_recommended_package_line, at this point in the function,
    n_entries is always >= 1.  Coverity doesn't like us checking it for
    0.
    
    CID 1268063.
---
 src/or/dirserv.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 58ab009..2e5766a 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -3745,7 +3745,9 @@ validate_recommended_package_line(const char *line)
     cp = end_of_word + 1;
   }
 
-  return (n_entries == 0) ? 0 : 1;
+  /* If we reach this point, we have at least 1 entry. */
+  tor_assert(n_entries > 0)
+  return 1;
 }
 
 /** Release all storage used by the directory server. */

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits