From 825173a2baa988ab51ded416811070363f945f7d Mon Sep 17 00:00:00 2001
From: Victor Julien <victor@inliniac.net>
Date: Fri, 8 Nov 2019 11:35:02 +0100
Subject: [PATCH] threading: fix flow timeout loop race

---
 src/tm-threads.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/tm-threads.c b/src/tm-threads.c
index 9d5105a6ef..bd1a856988 100644
--- a/src/tm-threads.c
+++ b/src/tm-threads.c
@@ -217,12 +217,11 @@ static int TmThreadTimeoutLoop(ThreadVars *tv, TmSlot *s)
                 }
             }
         } else {
+            if (TmThreadsCheckFlag(tv, THV_KILL)) {
+                break;
+            }
             SleepUsec(1);
         }
-
-        if (tv->stream_pq->len == 0 && TmThreadsCheckFlag(tv, THV_KILL)) {
-            break;
-        }
     }
     SCLogDebug("flow end loop complete");