From: Oleksii Shumeiko -X (oshumeik - SOFTSERVE INC at Cisco) <oshumeik@cisco.com>
Date: Sun, 13 Apr 2025 08:12:37 +0000 (+0000)
Subject: Pull request #4700: Handle utility Shell calls
X-Git-Tag: 3.7.3.0~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21ab3fc92301c6735dd70236a372ca1604cdea05;p=thirdparty%2Fsnort3.git

Pull request #4700: Handle utility Shell calls

Merge in SNORT/snort3 from ~OSHUMEIK/snort3:ha_fix to master

Squashed commit of the following:

commit 6e62646b481c53a5b0d54acee0a2adc570c5c003
Author: Oleksii Shumeiko <oshumeik@cisco.com>
Date:   Sat Apr 12 00:32:33 2025 +0300

    main: do not collect configurations for utility shells

    This fixes null pointer de-reference.
---

diff --git a/src/main/shell.cc b/src/main/shell.cc
index 3416896ea..846a5db7b 100644
--- a/src/main/shell.cc
+++ b/src/main/shell.cc
@@ -660,7 +660,7 @@ bool Shell::configure(SnortConfig* sc, bool is_root, std::list<ConfigData*> *con
         config_output->dump_config(*config_data, to_clear);
     }
 
-    if ( sc->gen_dump_config() )
+    if ( sc->gen_dump_config() and config_data_to_dump )
     {
         config_data_to_dump->push_back(config_data);
         config_data = nullptr;