Fix symbols removal in composites.

diff --git a/src/libmime/filter.c b/src/libmime/filter.c
index b294abc3657fc829f06e72dd991c3c81727097f1..70e5c3c6b7043d0e8e90086c6b9ae627836e9786 100644 (file)
--- a/src/libmime/filter.c
+++ b/src/libmime/filter.c
@@ -572,11 +572,9 @@ rspamd_composite_expr_process (gpointer input, rspamd_expression_atom_t *atom)
                 * evaluated.
                 */
                if ((rd = g_tree_lookup (cd->symbols_to_remove, ms->name)) == NULL) {
-                       g_tree_insert (cd->symbols_to_remove,
-                                       (gpointer)ms->name,
-                                       rd);
                        rd = rspamd_mempool_alloc (cd->task->task_pool, sizeof (*rd));
                        rd->ms = ms;
+
                        if (G_UNLIKELY (t == '~')) {
                                rd->remove_weight = FALSE;
                                rd->remove_symbol = TRUE;
@@ -589,7 +587,11 @@ rspamd_composite_expr_process (gpointer input, rspamd_expression_atom_t *atom)
                                rd->remove_symbol = TRUE;
                                rd->remove_weight = TRUE;
                        }
+
                        rd->comp = g_list_prepend (NULL, cd->composite);
+                       g_tree_insert (cd->symbols_to_remove,
+                                       (gpointer)ms->name,
+                                       rd);
                }
                else {
                        /*