From: Justin Viiret <justin.viiret@intel.com>
Date: Sun, 14 Aug 2016 23:58:06 +0000 (+1000)
Subject: tamarama: check for match halt in _Q2 as well
X-Git-Tag: v4.3.0^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87e32c90372a22140c67db23ab8935b2c6be35de;p=thirdparty%2Fvectorscan.git

tamarama: check for match halt in _Q2 as well
---

diff --git a/src/nfa/tamarama.c b/src/nfa/tamarama.c
index 4286a67e..b5f90e85 100644
--- a/src/nfa/tamarama.c
+++ b/src/nfa/tamarama.c
@@ -431,6 +431,9 @@ char nfaExecTamarama0_Q2(const struct NFA *n,
         rv = nfaQueueExec2_raw(q1.nfa, &q1, end);
         q->report_current = q1.report_current;
         copy = 1;
+        if (can_stop_matching(q->scratch)) {
+            break;
+        }
     }
     if (copy) {
         copyBack(t, q, &q1);