From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Mon, 29 Feb 2016 17:58:52 +0000 (-0500)
Subject: Merge pull request #304 in SNORT/snort3 from crc/sanity to master
X-Git-Tag: 3.0.0-233~571
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1e08cce21f6a744522eaf4c298ff2dbbdcebf883;p=thirdparty%2Fsnort3.git

Merge pull request #304 in SNORT/snort3 from crc/sanity to master

Squashed commit of the following:

commit 55b341dddd08d6604b92fa281aa6588d48866f5e
Author: Russ Combs <rucombs@cisco.com>
Date:   Mon Feb 29 07:26:27 2016 -0500

    work around pointer issues
---

diff --git a/src/network_inspectors/perf_monitor/perf_monitor.cc b/src/network_inspectors/perf_monitor/perf_monitor.cc
index 20f35f9fd..2c546ded7 100644
--- a/src/network_inspectors/perf_monitor/perf_monitor.cc
+++ b/src/network_inspectors/perf_monitor/perf_monitor.cc
@@ -248,7 +248,8 @@ void PerfMonitor::eval(Packet* p)
 //FIXIT-M uncouple from Snort class when framework permits
 void perf_monitor_idle_process()
 {
-    this_perf_monitor->eval(nullptr);
+    if ( this_perf_monitor )
+        this_perf_monitor->eval(nullptr);
 }
 
 static bool ready_to_process(Packet* p)
diff --git a/src/stream/tcp/stream_tcp.cc b/src/stream/tcp/stream_tcp.cc
index 44fd8fcda..e6c915b5b 100644
--- a/src/stream/tcp/stream_tcp.cc
+++ b/src/stream/tcp/stream_tcp.cc
@@ -58,7 +58,8 @@ StreamTcp::StreamTcp (TcpStreamConfig* c)
 
 StreamTcp::~StreamTcp()
 {
-    delete config;
+    // FIXIT-H this gets referenced by TcpReassembler later
+    //delete config;
 }
 
 void StreamTcp::show(SnortConfig*)