Merge pull request #492 in SNORT/snort3 from perf_seg to master

Squashed commit of the following:

commit e3b1088fe97bde6220cbaa7cbca9c09c668aedb7
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Wed May 25 15:23:07 2016 -0400

    fixed perf idle segfault

diff --git a/src/network_inspectors/perf_monitor/perf_monitor.cc b/src/network_inspectors/perf_monitor/perf_monitor.cc
index 4e1bd8028dc317d548f630b7b097282c84a912ba..3b031bff847c11546cd939dc37be89fcb6947ae2 100644 (file)
--- a/src/network_inspectors/perf_monitor/perf_monitor.cc
+++ b/src/network_inspectors/perf_monitor/perf_monitor.cc
@@ -86,7 +86,7 @@ public:
     void tterm() override;
 };
 
-static THREAD_LOCAL PerfMonitor* this_perf_monitor;
+static THREAD_LOCAL PerfMonitor* this_perf_monitor = nullptr;
 
 PerfMonitor::PerfMonitor(PerfMonModule* mod)
 {