Finish expression evaluation.

diff --git a/src/libutil/expression.c b/src/libutil/expression.c
index 113b87ecad051d3e6e4efee328ea377d80f99f37..928bfad3266537233a5ca08e212fbac937bad306 100644 (file)
--- a/src/libutil/expression.c
+++ b/src/libutil/expression.c
@@ -552,7 +552,7 @@ rspamd_process_expression (struct rspamd_expression *expr, gpointer data)
        struct rspamd_expression_elt *elt, *st_elt[2], *ev, *lim = NULL,
                        *cmp_op = NULL, *check;
        guint i, j, cmp_pos = 0;
-       gint cur_value = 0;
+       gint cur_value = 0, ret = 0;
        gboolean done = FALSE;
 
        g_assert (expr != NULL);
@@ -776,7 +776,18 @@ rspamd_process_expression (struct rspamd_expression *expr, gpointer data)
                }
        }
 
-       return 0;
+       g_assert (expr->expression_stack->len == 1);
+       ev = rspamd_expr_stack_pop (expr);
+       ret = ev->value;
+
+       /* Cleanup */
+       for (i = 0; i < expr->expressions->len; i ++) {
+               elt = &g_array_index (expr->expressions, struct rspamd_expression_elt, i);
+               elt->value = 0;
+               elt->flags = 0;
+       }
+
+       return ret;
 }
 
 GString *