]> git.ipfire.org Git - thirdparty/snort3.git/commitdiff
Pull request #4072: search_tool: fall back to normal mpse if no snort config
authorRon Dempster (rdempste) <rdempste@cisco.com>
Thu, 26 Oct 2023 19:34:27 +0000 (19:34 +0000)
committerRon Dempster (rdempste) <rdempste@cisco.com>
Thu, 26 Oct 2023 19:34:27 +0000 (19:34 +0000)
Merge in SNORT/snort3 from ~RDEMPSTE/snort3:muster to master

Squashed commit of the following:

commit da21ec1a104bde95dc1f944fb50411daf0732803
Author: Ron Dempster (rdempste) <rdempste@cisco.com>
Date:   Thu Oct 26 10:18:18 2023 -0400

    search_tool: fall back to normal mpse if no snort config

src/search_engines/search_tool.cc

index f8aebd0aa641bdd572649f84fcd61b6e9af8d10d..698c37286772b720219aa73ae987a8e977da8184 100644 (file)
@@ -139,7 +139,7 @@ int SearchTool::find_all(
     int num = 0;
     if (!sc)
         sc = SnortConfig::get_conf();
-    const FastPatternConfig* fp = sc->fast_pattern_config;
+    const FastPatternConfig* fp = sc ? sc->fast_pattern_config : nullptr;
 
     if ( confine && max_len > 0 )
     {