From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 20 Jun 2019 09:28:23 +0000 (+0100)
Subject: [Minor] Fix some missing userdata
X-Git-Tag: 2.0~755^2~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f133f139d57eff6d5c8ffe57687703620a388e28;p=thirdparty%2Frspamd.git

[Minor] Fix some missing userdata
---

diff --git a/src/libstat/backends/redis_backend.c b/src/libstat/backends/redis_backend.c
index 5d8ccc065b..e430e491e0 100644
--- a/src/libstat/backends/redis_backend.c
+++ b/src/libstat/backends/redis_backend.c
@@ -1593,6 +1593,7 @@ rspamd_redis_process_tokens (struct rspamd_task *task,
 			ev_timer_again (task->event_loop, &rt->timeout_event);
 		}
 		else {
+			rt->timeout_event.data = rt;
 			ev_timer_init (&rt->timeout_event, rspamd_redis_timeout,
 					rt->ctx->timeout, 0.);
 			ev_timer_start (task->event_loop, &rt->timeout_event);
@@ -1804,6 +1805,7 @@ rspamd_redis_learn_tokens (struct rspamd_task *task, GPtrArray *tokens,
 			ev_timer_again (task->event_loop, &rt->timeout_event);
 		}
 		else {
+			rt->timeout_event.data = rt;
 			ev_timer_init (&rt->timeout_event, rspamd_redis_timeout,
 					rt->ctx->timeout, 0.);
 			ev_timer_start (task->event_loop, &rt->timeout_event);
diff --git a/src/libstat/stat_config.c b/src/libstat/stat_config.c
index 52c78ba6b0..bc4c28b5dd 100644
--- a/src/libstat/stat_config.c
+++ b/src/libstat/stat_config.c
@@ -558,6 +558,7 @@ rspamd_stat_ctx_register_async (rspamd_stat_async_handler handler,
 		 * First we set timeval to zero as we want cb to be executed as
 		 * fast as possible
 		 */
+		elt->timer_ev.data = elt;
 		ev_timer_init (&elt->timer_ev, rspamd_async_elt_on_timer, 0.0, 0.0);
 		ev_timer_start (st_ctx->event_loop, &elt->timer_ev);
 	}
diff --git a/src/libutil/map.c b/src/libutil/map.c
index 3d9c84ea76..3ca94806ff 100644
--- a/src/libutil/map.c
+++ b/src/libutil/map.c
@@ -1234,6 +1234,7 @@ rspamd_map_schedule_periodic (struct rspamd_map *map,
 	map->scheduled_check = TRUE;
 	REF_INIT_RETAIN (cbd, rspamd_map_periodic_dtor);
 
+	cbd->ev.data = cbd;
 	ev_timer_init (&cbd->ev, rspamd_map_periodic_callback, jittered_sec, 0.0);
 	ev_timer_start (map->event_loop, &cbd->ev);
 
diff --git a/src/rspamd.c b/src/rspamd.c
index 813b7b7bb6..765b4bd2bc 100644
--- a/src/rspamd.c
+++ b/src/rspamd.c
@@ -391,6 +391,7 @@ rspamd_fork_delayed (struct rspamd_worker_conf *cf,
 	tv.tv_sec = SOFT_FORK_TIME;
 	tv.tv_usec = 0;
 	REF_RETAIN (cf);
+	nw->wait_ev.data = nw;
 	ev_timer_init (&nw->wait_ev, rspamd_fork_delayed_cb, SOFT_FORK_TIME, 0.0);
 	ev_timer_start (rspamd_main->event_loop, &nw->wait_ev);
 }