From: Vsevolod Stakhov <vsevolod@rspamd.com>
Date: Fri, 10 Nov 2023 08:56:29 +0000 (+0000)
Subject: [Fix] Fix bad access when printing pending events on failure path
X-Git-Tag: 3.8.0~80^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aca7d247ccd1d1c6abbd96fc0b18f8d613b9a101;p=thirdparty%2Frspamd.git

[Fix] Fix bad access when printing pending events on failure path
---

diff --git a/src/libserver/async_session.c b/src/libserver/async_session.c
index 962d513680..baaee627ec 100644
--- a/src/libserver/async_session.c
+++ b/src/libserver/async_session.c
@@ -196,10 +196,10 @@ void rspamd_session_remove_event_full(struct rspamd_async_session *session,
 	search_ev.user_data = ud;
 	k = kh_get(rspamd_events_hash, session->events, &search_ev);
 	if (k == kh_end(session->events)) {
-		gchar t;
 
-		msg_err_session("cannot find event: %p(%p) from %s", fin, ud, event_source);
-		kh_foreach(session->events, found_ev, t, {
+		msg_err_session("cannot find event: %p(%p) from %s (%d total events)", fin, ud,
+						event_source, (int) kh_size(session->events));
+		kh_foreach_key(session->events, found_ev, {
 			msg_err_session("existing event %s (%s): %p(%p)",
 							found_ev->subsystem,
 							found_ev->event_source,
@@ -207,8 +207,6 @@ void rspamd_session_remove_event_full(struct rspamd_async_session *session,
 							found_ev->user_data);
 		});
 
-		(void) t;
-
 		g_assert_not_reached();
 	}