implements fixes from jruizgit#386

mmclarnon · Feb 18, 2022 · 81f2817 · 81f2817
1 parent 72070f4
commit 81f2817
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/rules/events.c b/src/rules/events.c
@@ -609,10 +609,10 @@ static unsigned int reduceExpressionSequence(ruleset *tree,
         }
 
 
-        if ((operator == OP_AND && !targetProperty->value.b) || 
-            (operator == OP_OR && targetProperty->value.b)) {
-            while (currentExpression->operator != OP_END) {
-                ++*i;
+       if ((((operator == OP_AND) && !targetProperty->value.b) || 
+             ((operator == OP_OR)  &&  targetProperty->value.b))
+            && (*i < exprs->length)) {
+            while ((currentExpression->operator != OP_END) && (++*i < exprs->length)) {
                 currentExpression = &exprs->expressions[*i];
             }
             return RULES_OK;