]> git.ipfire.org Git - thirdparty/snort3.git/commitdiff
Pull request #4700: Handle utility Shell calls
authorOleksii Shumeiko -X (oshumeik - SOFTSERVE INC at Cisco) <oshumeik@cisco.com>
Sun, 13 Apr 2025 08:12:37 +0000 (08:12 +0000)
committerOleksii Shumeiko -X (oshumeik - SOFTSERVE INC at Cisco) <oshumeik@cisco.com>
Sun, 13 Apr 2025 08:12:37 +0000 (08:12 +0000)
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.

src/main/shell.cc

index 3416896ea14511da78b354bcec6db81417b97e10..846a5db7bd3fa84bf391ec8c6c0315cc8df67fde 100644 (file)
@@ -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;