diff --git a/src/util/list.h b/src/util/list.h
index 17800e4..d50eb1e 100644
--- a/src/util/list.h
+++ b/src/util/list.h
@@ -241,6 +241,13 @@
 	&pos->member != (head);                                         \
 	pos = LIST_ENTRY(type, pos->member.next, member))
 
+#define list_for_each_entry_from_safe(type, pos, start, head, member)   \
+   for (type *pos = LIST_ENTRY(type, (start), member),                  \
+	     *__next = LIST_ENTRY(type, pos->member.next, member);      \
+	&pos->member != (head);                                         \
+	pos = __next,                                                   \
+	__next = LIST_ENTRY(type, __next->member.next, member))
+
 #define list_for_each_entry_from_rev(type, pos, start, head, member)    \
    for (type *pos = LIST_ENTRY(type, (start), member);                  \
 	&pos->member != (head);                                         \