Merge pull request #1297 in SNORT/snort3 from reload_crash to master

Squashed commit of the following:

commit 9b2fad5be6056526525edab816181c3bbea7582c
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Fri Jun 29 09:21:27 2018 -0400

    FrameworkPolicy: fixed adding probe to wrong SnortConfig

diff --git a/src/managers/inspector_manager.cc b/src/managers/inspector_manager.cc
index fb13e026cd34b361fac767b81397a8f83b00f8c2..ffcadd96d34e4d8e4140504b588b2e5fc08d156f 100644 (file)
--- a/src/managers/inspector_manager.cc
+++ b/src/managers/inspector_manager.cc
@@ -228,10 +228,10 @@ struct FrameworkPolicy
 
     bool default_binder;
 
-    void vectorize();
+    void vectorize(SnortConfig*);
 };
 
-void FrameworkPolicy::vectorize()
+void FrameworkPolicy::vectorize(SnortConfig* sc)
 {
     passive.alloc(ilist.size());
     packet.alloc(ilist.size());
@@ -281,7 +281,6 @@ void FrameworkPolicy::vectorize()
         {
             // probes always run
             // add them to default so they can be found on InspectorManager::probe
-            SnortConfig* sc = SnortConfig::get_conf();
             sc->policy_map->get_inspection_policy(0)->framework_policy->probe.add(p);
             break;
         }
@@ -481,6 +480,7 @@ void InspectorManager::delete_policy(InspectionPolicy* pi, bool cloned)
             s_trash2.push_back(p->handler);
         else
             s_trash.push_back(p->handler);
+
         delete p;
     }
     delete pi->framework_policy;
@@ -815,7 +815,7 @@ static bool configure(SnortConfig* sc, FrameworkPolicy* fp, bool cloned)
     }
 
     sort(fp->ilist.begin(), fp->ilist.end(), PHInstance::comp);
-    fp->vectorize();
+    fp->vectorize(sc);
 
     // FIXIT-M checking for wizard here would avoid fatals for
     // can't bind wizard but this exposes other issues that must
@@ -866,6 +866,7 @@ bool InspectorManager::configure(SnortConfig* sc, bool cloned)
     }
 
     set_inspection_policy(sc);
+
     return ok;
 }