Skip to content

Commit 6842d4b

Browse files
author
Felipe Zimmerle
committed
Fix block-block infinite loop.
Issue #1614
1 parent c51e3e2 commit 6842d4b

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

CHANGES

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
v3.0.x - YYYY-MMM-DD (To be released)
22
-------------------------------------
33

4+
- Fix block-block infinite loop.
5+
[Issue #1614 - @zimmerle, @michaelgranzow-avi]
46
- Correction remove_by_tag and remove_by_msg logic.
57
[Issue #1636 - @Minasu]
68
- Fix LMDB compile error

src/actions/disruptive/block.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ bool Block::evaluate(Rule *rule, Transaction *transaction,
3737
#endif
3838

3939
for (Action *a : transaction->m_rules->m_defaultActions[rule->m_phase]) {
40-
if (a->isDisruptive() == false) {
40+
if (a->isDisruptive() == false
41+
|| dynamic_cast<actions::disruptive::Block *>(a) != NULL) {
4142
continue;
4243
}
4344
a->evaluate(rule, transaction, rm);

0 commit comments

Comments
 (0)