summaryrefslogtreecommitdiff
path: root/lib/command_match.c
diff options
context:
space:
mode:
authorpaco <paco@voltanet.io>2018-06-27 15:24:45 +0200
committerpaco <paco@voltanet.io>2018-06-27 15:24:45 +0200
commit64268e1a12c0a07293a5db9fc65df4d5f3f926c5 (patch)
treef092cda07f4b384cf6bf95cb20a6da15e37f27cc /lib/command_match.c
parent71a7b1f82f96c85d85b6984c76e3e50c531adae3 (diff)
lib: null check (2) (Coverity 1451361)
Additional correction to fa3016309b33395c02cf10e7e198517c5b81e55a Signed-off-by: F. Aragon <paco@voltanet.io>
Diffstat (limited to 'lib/command_match.c')
-rw-r--r--lib/command_match.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/command_match.c b/lib/command_match.c
index 4893ead042..c165305d78 100644
--- a/lib/command_match.c
+++ b/lib/command_match.c
@@ -608,12 +608,14 @@ static struct cmd_token *disambiguate_tokens(struct cmd_token *first,
static struct list *disambiguate(struct list *first, struct list *second,
vector vline, unsigned int n)
{
+ assert(first != NULL);
+ assert(second != NULL);
// doesn't make sense for these to be inequal length
- assert(first && second);
assert(first->count == second->count);
assert(first->count == vector_active(vline) - n + 1);
- struct listnode *fnode = listhead(first), *snode = listhead(second);
+ struct listnode *fnode = listhead_unchecked(first),
+ *snode = listhead_unchecked(second);
struct cmd_token *ftok = listgetdata(fnode), *stok = listgetdata(snode),
*best = NULL;