From e95a25193520e97e729181feb5c5a649c5102782 Mon Sep 17 00:00:00 2001
From: Xiang Wang <xiang.w.wang@intel.com>
Date: Mon, 11 Jul 2016 10:08:40 -0400
Subject: [PATCH] UE-2991: avoid copying one unnecessary subqueue item

---
 src/nfa/tamarama.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/nfa/tamarama.c b/src/nfa/tamarama.c
index b7ba126c..4286a67e 100644
--- a/src/nfa/tamarama.c
+++ b/src/nfa/tamarama.c
@@ -243,13 +243,15 @@ void copyBack(const struct  Tamarama *t, struct mq *q, struct mq *q1) {
     u32 numItems = q1->end > q1->cur + 1 ? q1->end - q1->cur - 1 : 1;
     // Also need to copy MQE_END if the main queue is empty
     if (q->cur == q->end) {
-        numItems++;
+        assert(q->cur > 1 && q1->items[q1->end - 1].type == MQE_END);
+        q->items[--q->cur] = q1->items[q1->end - 1];
     }
     u32 cur = q->cur - numItems;
     q->items[cur] = q1->items[q1->cur++];
     q->items[cur].type = MQE_START;
     q->cur = cur++;
     for (u32 i = 0; i < numItems - 1; ++i) {
+        assert(q1->cur < q1->end);
         u32 type = q1->items[q1->cur].type;
         if (type > MQE_END) {
             q1->items[q1->cur].type = type - event_base + base;