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 cd9cd105911e2316e8bbbfec87037287253e4242..6000320da3e38ee1e05f4b7e7298d91599481d97 100644 (file)
--- a/lib/list/list.h
+++ b/lib/list/list.h
@@ -40,6 +40,12 @@ struct list {
 #define list_for_each_entry_continue(_list, _pos, _member) \
        for (; _pos; _pos = list_next_entry(_list, _pos, _member))
 
+#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 = { \