From: Tom Peters (thopeter) <thopeter@cisco.com>
Date: Fri, 16 Jul 2021 02:07:37 +0000 (+0000)
Subject: Merge pull request #2979 in SNORT/snort3 from ~KATHARVE/snort3:h2i_assert_fix to... 
X-Git-Tag: 3.1.9.0~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7782f42c97dfef4cf40ad306437b01e519a0b396;p=thirdparty%2Fsnort3.git

Merge pull request #2979 in SNORT/snort3 from ~KATHARVE/snort3:h2i_assert_fix to master

Squashed commit of the following:

commit 8a7d79a6f743f696efe67be5b889cd295108c0a9
Author: Katura Harvey <katharve@cisco.com>
Date:   Wed Jul 14 16:58:50 2021 -0400

    http2_inspect: change xor to or in assert that was failing due to uninitialized variable
---

diff --git a/src/service_inspectors/http2_inspect/http2_headers_frame.cc b/src/service_inspectors/http2_inspect/http2_headers_frame.cc
index 2de30bf67..6dad237f4 100644
--- a/src/service_inspectors/http2_inspect/http2_headers_frame.cc
+++ b/src/service_inspectors/http2_inspect/http2_headers_frame.cc
@@ -97,7 +97,7 @@ void Http2HeadersFrame::process_decoded_headers(HttpFlowData* http_flow, SourceI
                 (header_scan_result == StreamSplitter::SEARCH)) or
             ((!session_data->is_processing_partial_header() and
                 (header_scan_result == StreamSplitter::FLUSH))));
-        assert(session_data->is_processing_partial_header() ^
+        assert(session_data->is_processing_partial_header() or
             ((int64_t)flush_offset == http1_header.length()));
         UNUSED(header_scan_result);
     }