From 1fc12719b6d878622e25825ef32615f281bb5e4d Mon Sep 17 00:00:00 2001 From: Alvaro Neira Date: Mon, 12 Jan 2015 14:46:14 +0100 Subject: src: don't create iterator with empty list Currently, we create iterator without test if the list is empty. If the list is empty, we have a crash when we set up the current element. With this patch, we test if the list is empty before to create the iterator. If the list is empty the iterator return NULL. Signed-off-by: Alvaro Neira Ayuso Signed-off-by: Pablo Neira Ayuso --- src/set_elem.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/set_elem.c') diff --git a/src/set_elem.c b/src/set_elem.c index 95f12bf..4f52b1a 100644 --- a/src/set_elem.c +++ b/src/set_elem.c @@ -690,7 +690,11 @@ struct nft_set_elems_iter *nft_set_elems_iter_create(struct nft_set *s) iter->set = s; iter->list = &s->element_list; - iter->cur = list_entry(s->element_list.next, struct nft_set_elem, head); + if (list_empty(&s->element_list)) + iter->cur = NULL; + else + iter->cur = list_entry(s->element_list.next, + struct nft_set_elem, head); return iter; } @@ -706,6 +710,9 @@ struct nft_set_elem *nft_set_elems_iter_next(struct nft_set_elems_iter *iter) { struct nft_set_elem *s = iter->cur; + if (s == NULL) + return NULL; + iter->cur = list_entry(iter->cur->head.next, struct nft_set_elem, head); if (&iter->cur->head == iter->list->next) return NULL; -- cgit v1.2.3