From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 1 Sep 2015 13:52:46 +0000 (-0400)
Subject: Fix an always-false check with an assertion
X-Git-Tag: tor-0.2.7.3-rc~73
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f4ded2cdc98f46817c381fc633e3161d52f75242;p=thirdparty%2Ftor.git

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.
---

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 58ab009cbf..2e5766aa14 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. */