Fix block-block infinite loop.

Issue #1614
This commit is contained in:
Felipe Zimmerle 2018-02-28 12:05:01 -03:00
parent c51e3e242c
commit 6842d4bba8
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
2 changed files with 4 additions and 1 deletions

View File

@ -1,6 +1,8 @@
v3.0.x - YYYY-MMM-DD (To be released)
-------------------------------------
- Fix block-block infinite loop.
[Issue #1614 - @zimmerle, @michaelgranzow-avi]
- Correction remove_by_tag and remove_by_msg logic.
[Issue #1636 - @Minasu]
- Fix LMDB compile error

View File

@ -37,7 +37,8 @@ bool Block::evaluate(Rule *rule, Transaction *transaction,
#endif
for (Action *a : transaction->m_rules->m_defaultActions[rule->m_phase]) {
if (a->isDisruptive() == false) {
if (a->isDisruptive() == false
|| dynamic_cast<actions::disruptive::Block *>(a) != NULL) {
continue;
}
a->evaluate(rule, transaction, rm);