From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 19 Mar 2015 12:24:15 +0000 (+0000)
Subject: Select operand on OR operation.
X-Git-Tag: 0.9.0~462
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=448eee861df91ecc2c7a505f2463d03cf1112fef;p=thirdparty%2Frspamd.git

Select operand on OR operation.
---

diff --git a/src/libutil/expression.c b/src/libutil/expression.c
index 928bfad326..4b987ccaec 100644
--- a/src/libutil/expression.c
+++ b/src/libutil/expression.c
@@ -598,6 +598,7 @@ rspamd_process_expression (struct rspamd_expression *expr, gpointer data)
 				g_assert (expr->expression_stack->len > 1);
 				st_elt[0] = rspamd_expr_stack_pop (expr);
 				st_elt[1] = rspamd_expr_stack_pop (expr);
+				ev = CHOSE_OPERAND (st_elt[0], st_elt[1]);
 				PROCESS_ELT (expr, ev);
 
 				if (ev->value) {