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/table.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/table.c') diff --git a/src/table.c b/src/table.c index c93e6fb..e947394 100644 --- a/src/table.c +++ b/src/table.c @@ -544,7 +544,10 @@ struct nft_table_list_iter *nft_table_list_iter_create(struct nft_table_list *l) return NULL; iter->list = l; - iter->cur = list_entry(l->list.next, struct nft_table, head); + if (nft_table_list_is_empty(l)) + iter->cur = NULL; + else + iter->cur = list_entry(l->list.next, struct nft_table, head); return iter; } @@ -554,6 +557,9 @@ struct nft_table *nft_table_list_iter_next(struct nft_table_list_iter *iter) { struct nft_table *r = iter->cur; + if (r == NULL) + return NULL; + /* get next table, if any */ iter->cur = list_entry(iter->cur->head.next, struct nft_table, head); if (&iter->cur->head == iter->list->list.next) -- cgit v1.2.3