From: Vsevolod Stakhov <vsevolod@rspamd.com>
Date: Sat, 17 Aug 2024 15:58:56 +0000 (+0100)
Subject: [Fix] Check message before trying to dereference pointer
X-Git-Tag: 3.10.0~32^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=621024be1d487db00ccb168c33cce9ee2b94f103;p=thirdparty%2Frspamd.git

[Fix] Check message before trying to dereference pointer

Issue: #5089
---

diff --git a/src/controller.c b/src/controller.c
index d91f990983..386448f93c 100644
--- a/src/controller.c
+++ b/src/controller.c
@@ -1945,7 +1945,7 @@ rspamd_controller_learn_fin_task(void *ud)
 
 	if (task->err != NULL) {
 		msg_info_session("cannot learn <%s>: %e",
-						 MESSAGE_FIELD(task, message_id), task->err);
+						 MESSAGE_FIELD_CHECK(task, message_id), task->err);
 		rspamd_controller_send_error(conn_ent, task->err->code, "%s",
 									 task->err->message);
 
@@ -1957,14 +1957,14 @@ rspamd_controller_learn_fin_task(void *ud)
 		msg_info_task("<%s> learned message as %s: %s",
 					  rspamd_inet_address_to_string(session->from_addr),
 					  session->is_spam ? "spam" : "ham",
-					  MESSAGE_FIELD(task, message_id));
+					  MESSAGE_FIELD_CHECK(task, message_id));
 		rspamd_controller_send_string(conn_ent, "{\"success\":true}");
 		return TRUE;
 	}
 
 	if (!rspamd_task_process(task, RSPAMD_TASK_PROCESS_LEARN)) {
 		msg_info_task("cannot learn <%s>: %e",
-					  MESSAGE_FIELD(task, message_id), task->err);
+					  MESSAGE_FIELD_CHECK(task, message_id), task->err);
 
 		if (task->err) {
 			rspamd_controller_send_error(conn_ent, task->err->code, "%s",
@@ -1985,7 +1985,7 @@ rspamd_controller_learn_fin_task(void *ud)
 			msg_info_task("<%s> learned message as %s: %s",
 						  rspamd_inet_address_to_string(session->from_addr),
 						  session->is_spam ? "spam" : "ham",
-						  MESSAGE_FIELD(task, message_id));
+						  MESSAGE_FIELD_CHECK(task, message_id));
 			rspamd_controller_send_string(conn_ent, "{\"success\":true}");
 		}
 
@@ -2114,7 +2114,7 @@ rspamd_controller_handle_learn_common(
 
 	if (!rspamd_task_process(task, RSPAMD_TASK_PROCESS_LEARN)) {
 		msg_warn_session("<%s> message cannot be processed",
-						 MESSAGE_FIELD(task, message_id));
+						 MESSAGE_FIELD_CHECK(task, message_id));
 		goto end;
 	}