From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Thu, 10 Dec 2015 18:29:52 +0000 (-0500)
Subject: Merge pull request #187 in SNORT/snort3 from stream_ut_segfault to master
X-Git-Tag: 3.0.0-233~682
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ff34c37e710d312177e1d2419b8abb4dfab9ae28;p=thirdparty%2Fsnort3.git

Merge pull request #187 in SNORT/snort3 from stream_ut_segfault to master

Squashed commit of the following:

commit 5ae5bdc494575f88346095721e3fcb0391c06e11
Author: davis mcpherson <davis.mcpherson@gmail.com>
Date:   Thu Dec 10 13:11:23 2015 -0500

    init TcpTracker structs to 0 in TcpSession constructor
---

diff --git a/src/stream/tcp/tcp_session.cc b/src/stream/tcp/tcp_session.cc
index c4aeaafbe..b14907c22 100644
--- a/src/stream/tcp/tcp_session.cc
+++ b/src/stream/tcp/tcp_session.cc
@@ -2383,6 +2383,9 @@ TcpSession::TcpSession(Flow* flow) :
     Session(flow), ecn(0), event_mask(0)
 {
     lws_init = tcp_init = false;
+
+    memset(&client, 0, sizeof(TcpTracker));
+    memset(&server, 0, sizeof(TcpTracker));
 }
 
 TcpSession::~TcpSession()