From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 22 Sep 2014 12:25:15 +0000 (+0100)
Subject: Fix subject rewriting for the default subject.
X-Git-Tag: 0.7.1~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05a46b8f2181daf06170613ce382c0c7ba58c7ad;p=thirdparty%2Frspamd.git

Fix subject rewriting for the default subject.

Issue:	#97
Submitted by:	@eneq123
---

diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c
index d5fbe70ac4..0a9fdc9ba5 100644
--- a/src/libserver/cfg_utils.c
+++ b/src/libserver/cfg_utils.c
@@ -716,6 +716,7 @@ rspamd_config_new_metric (struct rspamd_config *cfg, struct metric *c)
 		for (i = METRIC_ACTION_REJECT; i < METRIC_ACTION_MAX; i++) {
 			c->actions[i].score = -1.0;
 		}
+		c->subject = SPAM_SUBJECT;
 		rspamd_mempool_add_destructor (cfg->cfg_pool,
 			(rspamd_mempool_destruct_t) g_hash_table_destroy,
 			c->symbols);
diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c
index 26efc9b7cb..e70e2d954a 100644
--- a/src/libserver/protocol.c
+++ b/src/libserver/protocol.c
@@ -551,11 +551,15 @@ static const gchar *
 make_rewritten_subject (struct metric *metric, struct rspamd_task *task)
 {
 	static gchar subj_buf[1024];
-	gchar *p = subj_buf, *end, *c, *res;
-	const gchar *s;
+	gchar *p = subj_buf, *end, *res;
+	const gchar *s, *c;
 
 	end = p + sizeof(subj_buf);
 	c = metric->subject;
+	if (c == NULL) {
+		c = SPAM_SUBJECT;
+	}
+
 	s = g_mime_message_get_subject (task->message);
 
 	while (p < end) {