X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/295e0ff936937ae1b860c7e7271f63a670df25a3..f6033c46c877646b95bc2e99ce69097203bc5c77:/lib/eventlog.c

diff --git a/lib/eventlog.c b/lib/eventlog.c
index e652e22..b9ae495 100644
--- a/lib/eventlog.c
+++ b/lib/eventlog.c
@@ -48,7 +48,7 @@ void eventlog_remove(struct eventlog_output *lo) {
 }
 
 static void veventlog(const char *keyword, const char *raw, va_list ap) {
-  struct eventlog_output *p;
+  struct eventlog_output *p, *pnext;
   struct dynstr d;
   const char *param;
 
@@ -63,8 +63,12 @@ static void veventlog(const char *keyword, const char *raw, va_list ap) {
     dynstr_append_string(&d, raw);
   }
   dynstr_terminate(&d);
-  for(p = outputs; p; p = p->next)
+  for(p = outputs; p; p = pnext) {
+    /* We must be able to cope with eventlog_remove() being called from inside
+     * the callback */
+    pnext = p;
     p->fn(d.vec, p->user);
+  }
 }
 
 void eventlog_raw(const char *keyword, const char *raw, ...) {