list: Fix seg fault with list_for_each_entry_safe

[petitboot] / lib / list / list.h

diff --git a/lib/list/list.h b/lib/list/list.h
index dfe4813e52f6f9fe331227eff2eb998fbf52f6ee..6000320da3e38ee1e05f4b7e7298d91599481d97 100644 (file)
--- a/lib/list/list.h
+++ b/lib/list/list.h
@@ -22,25 +22,40 @@ struct list {
 #define list_for_each(_list, _pos) \
        for (_pos = (_list)->head.next; _pos != ((_list)->head); _pos = _pos->next)
 
-#define list_entry(_ptr, _type, _member) \
-       container_of(_ptr, _type, _member)
+#define list_entry(_ptr, _type, _member, _list) \
+       (&container_of(_ptr, _type, _member)->_member == &((_list)->head) \
+       ? NULL \
+       : container_of(_ptr, _type, _member))
+
+#define list_prev_entry(_list, _pos, _member) \
+       list_entry(_pos->_member.prev, typeof(*_pos), _member, _list)
+
+#define list_next_entry(_list, _pos, _member) \
+       list_entry(_pos->_member.next, typeof(*_pos), _member, _list)
 
 #define list_for_each_entry(_list, _pos, _member) \
-       for (_pos = list_entry((_list)->head.next, typeof(*_pos), _member); \
-            &_pos->_member != &(_list)->head; \
-            _pos = list_entry(_pos->_member.next, typeof(*_pos), _member))
+       for (_pos = list_entry((_list)->head.next, typeof(*_pos), _member, _list); \
+               _pos; _pos = list_next_entry(_list, _pos, _member))
 
 #define list_for_each_entry_continue(_list, _pos, _member) \
-       for (; &_pos->_member != &(_list)->head; \
-               _pos = list_entry(_pos->_member.next, typeof(*_pos), _member))
+       for (; _pos; _pos = list_next_entry(_list, _pos, _member))
 
-#define STATIC_LIST(_list) static struct list _list = { \
+#define list_for_each_entry_safe(_list, _pos, _tmp, _member) \
+       for (_pos = list_entry((_list)->head.next, typeof(*_pos), _member, _list), \
+               _tmp = list_entry(_pos->_member.next, typeof(*_pos), _member, _list); \
+       _pos; \
+       _pos = _tmp, \
+       _tmp = _tmp ? list_entry(_tmp->_member.next, typeof(*_pos), _member, _list) : NULL)
+
+#define DEFINE_LIST(_list) struct list _list = { \
        .head = { \
                .next = &_list.head, \
                .prev = &_list.head \
        } \
 }
 
+#define STATIC_LIST(_list) static DEFINE_LIST(_list)
+
 void list_init(struct list *list);
 void list_insert_before(struct list_item *next, struct list_item *item);
 void list_insert_after(struct list_item *prev, struct list_item *item);