Merge pull request #2423 from negram/dont-use-foreach-on-set

[Minor] kh_foreach should not be used with hash sets, it couses segfa…

1 files changed, 6 insertions, 5 deletions

diff --git a/src/libserver/events.c b/src/libserver/events.c
index f62005b96..bff35351f 100644
--- a/src/libserver/events.c
+++ b/src/libserver/events.c
@@ -309,14 +309,17 @@ void
 rspamd_session_cleanup (struct rspamd_async_session *session)
 {
 	struct rspamd_async_event *ev;
-	gchar t;
+	int i;
 
 	if (session == NULL) {
 		msg_err ("session is NULL");
 		return;
 	}
 
-	kh_foreach (session->events, ev, t, {
+	for (i = kh_begin (session->events); i != kh_end (session->events); i ++) {
+		if (!kh_exist (session->events, i)) continue;
+		ev = kh_key (session->events, i);
+
 		/* Call event's finalizer */
 		msg_debug_session ("removed event on destroy: %p, subsystem: %s",
 				ev->user_data,
@@ -325,9 +328,7 @@ rspamd_session_cleanup (struct rspamd_async_session *session)
 		if (ev->fin != NULL) {
 			ev->fin (ev->user_data);
 		}
-	});
-
-	(void)t;
+	}
 
 	kh_clear (rspamd_events_hash, session->events);
 }