From: Yurii Chalov -X (ychalov - SOFTSERVE INC at Cisco) <ychalov@cisco.com>
Date: Tue, 5 Sep 2023 08:55:34 +0000 (+0000)
Subject: Pull request #3978: main: prevent reloading unprepared thread
X-Git-Tag: 3.1.70.0~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae75f0d5f99e2c852059bdaa7e208634ed2d957a;p=thirdparty%2Fsnort3.git

Pull request #3978: main: prevent reloading unprepared thread

Merge in SNORT/snort3 from ~YCHALOV/snort3:thread_reinit_fix to master

Squashed commit of the following:

commit 2a1ca1397f62224c096b9bedb22b715db390e7ba
Author: Yurii Chalov <ychalov@cisco.com>
Date:   Mon Aug 28 13:42:53 2023 +0200

    main: prevent reloading unprepared thread
---

diff --git a/src/main/analyzer_command.cc b/src/main/analyzer_command.cc
index 2643345d2..e2aff46c9 100644
--- a/src/main/analyzer_command.cc
+++ b/src/main/analyzer_command.cc
@@ -139,6 +139,10 @@ ACResetStats::ACResetStats(clear_counter_type_t requested_type_l) : requested_ty
 
 bool ACSwap::execute(Analyzer& analyzer, void** ac_state)
 {
+    if (analyzer.get_state() != Analyzer::State::PAUSED and
+        analyzer.get_state() != Analyzer::State::RUNNING)
+        return false;
+
     if (ps)
     {
         ps->apply(analyzer);