2 files changed, 10 insertions, 6 deletions
diff --git a/src/list.c b/src/list.c
index 7714f5d..ea038f4 100644
--- a/src/list.c
+++ b/src/list.c
@@ -103,13 +103,17 @@ clist_iterator_has_next(iterator_t i)
 	return i.current != NULL;
 }
 
-list_item_t
-clist_iterator_next(iterator_t *iterator)
+void *
+clist_iterator_next(iterator_t *i)
 {
-  struct list_item_t *current = iterator->current;
-  iterator->current = iterator->current->next;
+	if (i == NULL || i->current == NULL)
+		return NULL;
 
-  return current;
+	void *data = i->current->data;
+	/* `next` can be NULL */
+	i->current = i->current->next;
+
+	return data;
 }
 
 char *
diff --git a/src/list.h b/src/list.h
index c98f8e8..da0793d 100644
--- a/src/list.h
+++ b/src/list.h
@@ -41,7 +41,7 @@ void         clist_add_all          (list_t *, list_t *);
 void         clist_remove           (list_t *, list_item_t *);
 iterator_t   clist_iterator         (list_t *);
 int          clist_iterator_has_next(iterator_t);
-list_item_t *clist_iterator_next    (iterator_t *);
+void        *clist_iterator_next    (iterator_t *);
 char*		 clist_version			(void);
 
 #endif