From: rcombs <rcombs@sq18.sfeng.sourcefire.com>
Date: Thu, 20 Nov 2014 01:58:35 +0000 (-0500)
Subject: fixed glaring missing array dereference; make daq init failures non-fatal
X-Git-Tag: 3.0.0-233~1185
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fdea0371f7586ac895fad1998bfa0f5f1696ca6f;p=thirdparty%2Fsnort3.git

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 41f0fb72e..25756a76f 100644
--- 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 c5c64b824..e56ade841 100644
--- 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() )