From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Wed, 25 May 2016 19:47:45 +0000 (-0400)
Subject: Merge pull request #492 in SNORT/snort3 from perf_seg to master
X-Git-Tag: 3.0.0-233~393
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05a7ea2c22c748525be41a28619d4e34123ae598;p=thirdparty%2Fsnort3.git

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 4e1bd8028..3b031bff8 100644
--- 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)
 {