From: Russ Combs <rucombs@cisco.com>
Date: Sat, 23 Aug 2014 23:43:57 +0000 (-0400)
Subject: tweaks
X-Git-Tag: 3.0.0-233~1419^2~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6bcb1af7b91e1acb1573aea1bbc547b751aaf2a1;p=thirdparty%2Fsnort3.git

tweaks
---

diff --git a/src/managers/inspector_manager.cc b/src/managers/inspector_manager.cc
index 6ee820f48..9523ae1fd 100644
--- a/src/managers/inspector_manager.cc
+++ b/src/managers/inspector_manager.cc
@@ -283,7 +283,7 @@ static PHInstance* get_instance(
     return nullptr;
 }
 
-static PHInstance* GetInstance(
+static PHInstance* get_new(
     PHClass* ppc, FrameworkPolicy* fp, const char* keyword)
 {
     PHInstance* p = get_instance(fp, keyword);
@@ -434,7 +434,7 @@ void InspectorManager::instantiate(
 
     else
     {
-        PHInstance* ppi = GetInstance(ppc, fp, keyword);
+        PHInstance* ppi = get_new(ppc, fp, keyword);
 
         if ( !ppi )
             ParseError("can't instantiate inspector: '%s'.", keyword);
diff --git a/src/network_inspectors/binder/binder.cc b/src/network_inspectors/binder/binder.cc
index 537450664..99fdbce37 100644
--- a/src/network_inspectors/binder/binder.cc
+++ b/src/network_inspectors/binder/binder.cc
@@ -49,9 +49,13 @@ THREAD_LOCAL ProfileStats bindPerfStats;
 static void set_session(Flow* flow, const char* key)
 {
     Inspector* pin = InspectorManager::get_inspector(key);
-    flow->set_client(pin);
-    flow->set_server(pin);
-    flow->clouseau = nullptr;
+
+    if ( pin )
+    {
+        flow->set_client(pin);
+        flow->set_server(pin);
+        flow->clouseau = nullptr;
+    }
 }
 
 static void set_session(Flow* flow)