From: Masud Hasan (mashasan) <mashasan@cisco.com>
Date: Wed, 3 Feb 2021 15:35:03 +0000 (+0000)
Subject: Merge pull request #2731 in SNORT/snort3 from ~ARMANDAV/snort3:napbug to master
X-Git-Tag: 3.1.2.0~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4377525375ea698ae75d2dd7b0f158c3fe39922;p=thirdparty%2Fsnort3.git

Merge pull request #2731 in SNORT/snort3 from ~ARMANDAV/snort3:napbug to master

Squashed commit of the following:

commit 4152a7d9d0d407bcd976cf00c344e3e653d69343
Author: Arun Mandava <armandav@cisco.com>
Date:   Mon Feb 1 13:26:24 2021 -0500

    stream: always use latest splitter from tracker after paf_check
---

diff --git a/src/stream/tcp/tcp_reassembler.cc b/src/stream/tcp/tcp_reassembler.cc
index bf31e3560..91118c9b3 100644
--- a/src/stream/tcp/tcp_reassembler.cc
+++ b/src/stream/tcp/tcp_reassembler.cc
@@ -955,6 +955,8 @@ int32_t TcpReassembler::scan_data_post_ack(TcpReassemblerState& trs, uint32_t* f
         int32_t flush_pt = paf_check(splitter, &trs.paf_state, p, tsn->payload(),
             flush_len, total, tsn->c_seq, flags);
 
+        // Get splitter from tracker as paf check may change it.
+        splitter = trs.tracker->get_splitter();
         trs.sos.seglist.cur_sseg = tsn;
 
         if ( flush_pt >= 0 )