commit 43e0472fcfc3723e781d20ae3fb23e9f28e2ef50 Author: Nick Mathewson nickm@torproject.org Date: Sat Nov 18 10:51:23 2017 -0500
Move an assertion to make scan-build happy again. --- src/or/dirvote.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/or/dirvote.c b/src/or/dirvote.c index ce82a5ef4..6b806879a 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -795,6 +795,9 @@ dirvote_compute_params(smartlist_t *votes, int method, int total_authorities) output = smartlist_new();
SMARTLIST_FOREACH_BEGIN(param_list, const char *, param) { + /* resolve spurious clang shallow analysis null pointer errors */ + tor_assert(param); + const char *next_param; int ok=0; eq = strchr(param, '='); @@ -807,8 +810,7 @@ dirvote_compute_params(smartlist_t *votes, int method, int total_authorities) next_param = NULL; else next_param = smartlist_get(param_list, param_sl_idx+1); - /* resolve spurious clang shallow analysis null pointer errors */ - tor_assert(param); + if (!next_param || strncmp(next_param, param, cur_param_len)) { /* We've reached the end of a series. */ /* Make sure enough authorities voted on this param, unless the