From cbf0ed9541fee2a480dda3533d1604a9df4ae9bb Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 4 Apr 2013 10:07:49 +0200
Subject: bugfix: script == comparison did not work properly on JSON objects

backport from 7.3 branch
---
 grammar/rainerscript.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'grammar/rainerscript.c')

diff --git a/grammar/rainerscript.c b/grammar/rainerscript.c
index b04e53b5..c14295af 100644
--- a/grammar/rainerscript.c
+++ b/grammar/rainerscript.c
@@ -1317,6 +1317,29 @@ cnfexprEval(struct cnfexpr *expr, struct var *ret, void* usrptr)
 				}
 				if(r.datatype == 'S') es_deleteStr(r.d.estr);
 			}
+		} else if(l.datatype == 'J') {
+			estr_l = var2String(&l, &bMustFree);
+			if(expr->r->nodetype == 'S') {
+				ret->d.n = !es_strcmp(estr_l, ((struct cnfstringval*)expr->r)->estr); /*CMP*/
+			} else if(expr->r->nodetype == 'A') {
+				ret->d.n = evalStrArrayCmp(estr_l,  (struct cnfarray*) expr->r, CMP_EQ);
+			} else {
+				cnfexprEval(expr->r, &r, usrptr);
+				if(r.datatype == 'S') {
+					ret->d.n = !es_strcmp(estr_l, r.d.estr); /*CMP*/
+				} else {
+					n_l = var2Number(&l, &convok_l);
+					if(convok_l) {
+						ret->d.n = (n_l == r.d.n); /*CMP*/
+					} else {
+						estr_r = var2String(&r, &bMustFree);
+						ret->d.n = !es_strcmp(estr_l, estr_r); /*CMP*/
+						if(bMustFree) es_deleteStr(estr_r);
+					}
+				}
+				if(r.datatype == 'S') es_deleteStr(r.d.estr);
+			}
+			if(bMustFree) es_deleteStr(estr_l);
 		} else {
 			cnfexprEval(expr->r, &r, usrptr);
 			if(r.datatype == 'S') {
-- 
cgit v1.2.3