Merge pull request #785 in SNORT/snort3 from bug_segv1 to master

Squashed commit of the following:

commit 868f4323c447c59c7b92a55ef6fafc14075aaf93
Author: Steve Chew <stechew@cisco.com>
Date:   Mon Jan 23 23:32:59 2017 -0500

    Fixed reload_config bugs.

diff --git a/src/flow/flow_cache.h b/src/flow/flow_cache.h
index e581a8dc391413425dedfaedfe910212f73bd5a5..cd5e8f1d1aced911dbc8845ab7af5324bde92977 100644 (file)
--- a/src/flow/flow_cache.h
+++ b/src/flow/flow_cache.h
@@ -77,7 +77,7 @@ private:
 
 private:
     static const unsigned cleanup_flows = 1;
-    const FlowConfig& config;
+    const FlowConfig config;
     unsigned uni_count;
     uint32_t flags;
 

diff --git a/src/network_inspectors/appid/appid_config.cc b/src/network_inspectors/appid/appid_config.cc
index d9b56b0b374f44c821e2417152778b24909fcee5..c0997038018994d096321f7f99290388b2f0ced4 100644 (file)
--- a/src/network_inspectors/appid/appid_config.cc
+++ b/src/network_inspectors/appid/appid_config.cc
@@ -66,8 +66,6 @@ AppIdModuleConfig::~AppIdModuleConfig()
 #endif
     snort_free((void*)app_detector_dir);
     snort_free((void*)thirdparty_appid_dir);
-    appid_config = nullptr;
-
 }
 
 AppIdConfig::AppIdConfig( AppIdModuleConfig* config )