Merge pull request #2138 in SNORT/snort3 from ~MDAGON/snort3:frame_hdr_wobody to...

Squashed commit of the following:

commit 880bf5d85b633eb7b49e9b9587bfc3323502a8ea
Author: mdagon <mdagon@cisco.com>
Date:   Mon Apr 6 16:36:19 2020 -0400

    http2_inspect: handle the case of leftover header only (no body)

diff --git a/src/service_inspectors/http2_inspect/http2_stream_splitter_impl.cc b/src/service_inspectors/http2_inspect/http2_stream_splitter_impl.cc
index d515988dfabe9e2db441a40f325cafda71787d82..65bde60005e927002f0bd8117d639a964a98abce 100644 (file)
--- a/src/service_inspectors/http2_inspect/http2_stream_splitter_impl.cc
+++ b/src/service_inspectors/http2_inspect/http2_stream_splitter_impl.cc
@@ -356,6 +356,12 @@ const StreamBuffer Http2StreamSplitter::implement_reassemble(Http2FlowData* sess
             }
         }
     }
+    else if (total == 0 && session_data->use_leftover_hdr[source_id])
+    {
+        memcpy(session_data->frame_header[source_id],
+            session_data->leftover_hdr[source_id], FRAME_HEADER_LENGTH);
+        session_data->use_leftover_hdr[source_id] = false;
+    }
     else
     {
         uint32_t data_offset = 0;