tweaks

diff --git a/src/managers/inspector_manager.cc b/src/managers/inspector_manager.cc
index 6ee820f4850fa0138517d5e4bfbf73246966158e..9523ae1fde25afe1220c55c8dc552acb838a0774 100644 (file)
--- 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 537450664614afc9c744c15ba0b9b748265f5925..99fdbce372135b58f3f8d1687c7f27a5c806a6de 100644 (file)
--- 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)