diff options
| author | teor <teor2345@gmail.com> | 2014-09-29 10:08:37 +1000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-09-28 20:51:23 -0400 |
| commit | ff8fe38a2fac97d34bba4d46edabb4dd1bbe6d90 (patch) | |
| tree | 78e3a12160d7455de69adb257aed0bdc281f3f72 /src/or/dirvote.c | |
| parent | 5190ec0bc4c22d7bab756e21db6e357ba07379c4 (diff) | |
| download | tor-ff8fe38a2fac97d34bba4d46edabb4dd1bbe6d90.tar.gz tor-ff8fe38a2fac97d34bba4d46edabb4dd1bbe6d90.zip | |
Stop spurious clang shallow analysis null pointer errors
Avoid 4 null pointer errors under clang shallow analysis (the default when
building under Xcode) by using tor_assert() to prove that the pointers
aren't null. Resolves issue 13284 via minor code refactoring.
Diffstat (limited to 'src/or/dirvote.c')
| -rw-r--r-- | src/or/dirvote.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 9ad92ca116..8a0fdf62fc 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -647,6 +647,8 @@ 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 |