From 0cd1b170ff91ee5002c9c9ea0b291f9189557bd1 Mon Sep 17 00:00:00 2001
From: Pavel Levshin <pavel@levshin.spb.ru>
Date: Tue, 29 Oct 2013 09:34:17 +0100
Subject: bugfix: abort if "if $syslogfacility-text..." was being used

---
 grammar/rainerscript.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'grammar/rainerscript.c')

diff --git a/grammar/rainerscript.c b/grammar/rainerscript.c
index 986d2802..b03e7c12 100644
--- a/grammar/rainerscript.c
+++ b/grammar/rainerscript.c
@@ -2926,12 +2926,15 @@ cnfexprOptimize(struct cnfexpr *expr)
 				expr->r = exprswap;
 			}
 		}
-		if(expr->l->nodetype == 'V') {
-			expr = cnfexprOptimize_CMP_var(expr);
-		}
 		if(expr->r->nodetype == 'A') {
 			cnfexprOptimize_CMPEQ_arr((struct cnfarray *)expr->r);
 		}
+		/* This should be evaluated last because it may change expr
+		 * to a function.
+		 */
+		if(expr->l->nodetype == 'V') {
+			expr = cnfexprOptimize_CMP_var(expr);
+		}
 		break;
 	case CMP_LE:
 	case CMP_GE:
-- 
cgit v1.2.3