From: Tom Peters (thopeter) <thopeter@cisco.com>
Date: Fri, 23 Apr 2021 16:07:00 +0000 (+0000)
Subject: Merge pull request #2862 in SNORT/snort3 from ~KATHARVE/snort3:h2_clear to master
X-Git-Tag: 3.1.5.0~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05df895deef0d6127b3609bd5019c76af9f270bd;p=thirdparty%2Fsnort3.git

Merge pull request #2862 in SNORT/snort3 from ~KATHARVE/snort3:h2_clear to master

Squashed commit of the following:

commit 1dd6a2569c6edef71833921ce744cb4a8548eb26
Author: Katura Harvey <katharve@cisco.com>
Date:   Fri Apr 23 09:27:30 2021 -0400

    http2_inspect: add assert in clear
---

diff --git a/src/service_inspectors/http_inspect/http_inspect.cc b/src/service_inspectors/http_inspect/http_inspect.cc
index 72f1f0ff9..da9d73115 100755
--- a/src/service_inspectors/http_inspect/http_inspect.cc
+++ b/src/service_inspectors/http_inspect/http_inspect.cc
@@ -605,7 +605,7 @@ void HttpInspect::clear(Packet* p)
     if (h2i_flow_data != nullptr)
     {
         current_section = h2i_flow_data->get_hi_msg_section();
-        // assert(current_section != nullptr); // FIXIT-E fix H2I so that this is correct
+        assert(current_section != nullptr);
         h2i_flow_data->set_hi_msg_section(nullptr);
     }
     else