fixed glaring missing array dereference; make daq init failures non-fatal

diff --git a/src/managers/inspector_manager.cc b/src/managers/inspector_manager.cc
index 41f0fb72e2218b9aaeb6b27b7fb352c04726a1ed..25756a76f9f42456cbe7ab72d984fcbbd4e52d70 100644 (file)
--- a/src/managers/inspector_manager.cc
+++ b/src/managers/inspector_manager.cc
@@ -511,7 +511,7 @@ void InspectorManager::thread_stop(SnortConfig*)
         unsigned slot = get_instance_id();
 
         for ( auto* p : pi->framework_policy->ilist )
-            if ( p->pp_class.term )
+            if ( p->pp_class.term[slot] )
             {
                 p->handler->tterm();
                 p->pp_class.term[slot] = false;

diff --git a/src/packet_io/sfdaq.cc b/src/packet_io/sfdaq.cc
index c5c64b82450520cf29526daf26c1c7b3d0813fac..e56ade841b9e4d0beca4306697af860fb0f5b285 100644 (file)
--- a/src/packet_io/sfdaq.cc
+++ b/src/packet_io/sfdaq.cc
@@ -396,8 +396,7 @@ static int DAQ_Config (DAQ_Config_t* cfg)
     err = daq_initialize(daq_mod, cfg, &daq_hand, buf, sizeof(buf));
 
     if ( err )
-        FatalError("Can't initialize DAQ %s (%d) - %s\n",
-            type, err, buf);
+        ErrorMessage("Can't initialize DAQ %s (%d) - %s\n", type, err, buf);
 
     return err;
 }
@@ -471,7 +470,7 @@ int DAQ_Start ()
     int err = daq_start(daq_mod, daq_hand);
 
     if ( err )
-        FatalError("Can't start DAQ (%d) - %s\n",
+        ErrorMessage("Can't start DAQ (%d) - %s\n",
             err, daq_get_error(daq_mod, daq_hand));
 
     else if ( !DAQ_UnprivilegedStart() )