From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Tue, 7 Jan 2014 21:24:53 +0000 (+0000)
Subject: Fix: filter: check binary op nesting
X-Git-Tag: v2.3.2~18
X-Git-Url: http://git.liburcu.org/?a=commitdiff_plain;h=78ee086ba7ef13de1295950ecf7d8a3189b21263;hp=255d7d27a67f1100d7583617945d558b14b01e85;p=lttng-tools.git

Fix: filter: check binary op nesting

Should pass nesting + 1 as parameter rather than nesting++. Worked in
when nesting was in one direction (due to side-effect of the first ++),
but not the other.

Fixes #688

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: David Goulet <dgoulet@efficios.com>
---

diff --git a/src/lib/lttng-ctl/filter/filter-visitor-ir-check-binary-op-nesting.c b/src/lib/lttng-ctl/filter/filter-visitor-ir-check-binary-op-nesting.c
index 4db5ec93d..e093957c2 100644
--- a/src/lib/lttng-ctl/filter/filter-visitor-ir-check-binary-op-nesting.c
+++ b/src/lib/lttng-ctl/filter/filter-visitor-ir-check-binary-op-nesting.c
@@ -58,11 +58,11 @@ int check_bin_op_nesting_recursive(struct ir_op *node, int nesting)
 			return -EINVAL;
 		}
 		ret = check_bin_op_nesting_recursive(node->u.binary.left,
-				nesting++);
+				nesting + 1);
 		if (ret)
 			return ret;
 		return check_bin_op_nesting_recursive(node->u.binary.right,
-				nesting++);
+				nesting + 1);
 	}
 	case IR_OP_LOGICAL:
 	{