Skip to content

Bugfix/out of bounds in reduce expression sequence #386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Bugfix/out of bounds in reduce expression sequence #386

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f40423
fix currentExpression to be consistent with i
meigelb Nov 26, 2021
71de698
add boundary checks to avoid out-of-bounds access
meigelb Nov 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/rules/events.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,18 +601,20 @@ static unsigned int reduceExpressionSequence(ruleset *tree,
messageObject,
context,
targetProperty));
++*i;
++*i; // increment to next expression makes currentExpression invalid
}

if (targetProperty->type != JSON_BOOL) {
return ERR_OPERATION_NOT_SUPPORTED;
}


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)) {
// after reduceExpression() index i moved on to next currentExpression
currentExpression = &exprs->expressions[*i];
while ((currentExpression->operator != OP_END) && (++*i < exprs->length)) {
currentExpression = &exprs->expressions[*i];
}
return RULES_OK;
Expand Down