From: Mike Stepanek (mstepane) <mstepane@cisco.com>
Date: Thu, 29 Oct 2020 19:02:45 +0000 (+0000)
Subject: Merge pull request #2587 in SNORT/snort3 from ~THOPETER/snort3:h2i14 to master
X-Git-Tag: 3.0.3-5~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2333d80ee6a6fdf0ce4670fb4ddb537b11af4a04;p=thirdparty%2Fsnort3.git

Merge pull request #2587 in SNORT/snort3 from ~THOPETER/snort3:h2i14 to master

Squashed commit of the following:

commit 813cf2836d88aaff8f3dd6735dc1a8c04000cadb
Author: Tom Peters <thopeter@cisco.com>
Date:   Wed Oct 28 18:07:52 2020 -0400

    http2_inspect: multi-segment reassemble discard bug fix
---

diff --git a/src/service_inspectors/http2_inspect/http2_stream_splitter.cc b/src/service_inspectors/http2_inspect/http2_stream_splitter.cc
index 83c9c81ef..03ad730ea 100644
--- a/src/service_inspectors/http2_inspect/http2_stream_splitter.cc
+++ b/src/service_inspectors/http2_inspect/http2_stream_splitter.cc
@@ -159,7 +159,8 @@ const StreamBuffer Http2StreamSplitter::reassemble(Flow* flow, unsigned total, u
     if (session_data->payload_discard[source_id])
     {
         StreamBuffer frame_buf { nullptr, 0 };
-        session_data->payload_discard[source_id] = false;
+        if (flags & PKT_PDU_TAIL)
+            session_data->payload_discard[source_id] = false;
 
 #ifdef REG_TEST
         if (HttpTestManager::use_test_output(HttpTestManager::IN_HTTP2))