From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Wed, 23 Apr 2014 13:52:26 +0000 (+0100)
Subject: Another fix for legacy symbols output.
X-Git-Tag: 0.7.0~278
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c719ab34ec748f1095d79420745fe39b9477e0e2;p=thirdparty%2Frspamd.git

Another fix for legacy symbols output.
---

diff --git a/src/libmime/protocol.c b/src/libmime/protocol.c
index 907757ea63..1b7bdf42fb 100644
--- a/src/libmime/protocol.c
+++ b/src/libmime/protocol.c
@@ -659,7 +659,7 @@ static void
 rspamd_ucl_tolegacy_output (struct rspamd_task *task, ucl_object_t *top, GString *out)
 {
 	const ucl_object_t *metric, *score,
-		*required_score, *is_spam, *elt, *symbols;
+		*required_score, *is_spam, *elt;
 	ucl_object_iter_t iter = NULL;
 
 	metric = ucl_object_find_key (top, DEFAULT_METRIC);
@@ -677,14 +677,15 @@ rspamd_ucl_tolegacy_output (struct rspamd_task *task, ucl_object_t *top, GString
 				ucl_object_tostring (elt));
 		}
 
-		symbols = ucl_object_find_key (metric, "symbols");
 		iter = NULL;
-		while ((elt = ucl_iterate_object (symbols, &iter, true)) != NULL) {
-			const ucl_object_t *sym_score;
-			sym_score = ucl_object_find_key (elt, "score");
-			g_string_append_printf (out, "Symbol: %s; %.2f\r\n",
-					ucl_object_key (elt),
-					ucl_object_todouble (sym_score));
+		while ((elt = ucl_iterate_object (metric, &iter, true)) != NULL) {
+			if (elt->type == UCL_OBJECT) {
+				const ucl_object_t *sym_score;
+				sym_score = ucl_object_find_key (elt, "score");
+				g_string_append_printf (out, "Symbol: %s(%.2f)\r\n",
+						ucl_object_key (elt),
+						ucl_object_todouble (sym_score));
+			}
 		}
 
 		elt = ucl_object_find_key (metric, "subject");