Merge pull request #2436 in SNORT/snort3 from ~MDAGON/snort3:fix_warning to master

Squashed commit of the following:

commit e7d22e9969b20f155453634ed6e3277f3160f924
Author: mdagon <mdagon@cisco.com>
Date:   Mon Aug 31 15:12:20 2020 -0400

    code review: initialize select fields instead of using memset

commit ab983114ee4e375e3bac1407fb474409e18de9da
Author: mdagon <mdagon@cisco.com>
Date:   Fri Aug 28 13:01:23 2020 -0400

    payload_injector: fix warning

diff --git a/src/payload_injector/test/payload_injector_test.cc b/src/payload_injector/test/payload_injector_test.cc
index 30c4fb8ffa864220c520b619c8590c9dbfebddf8..0f847f8b9bcf390bcc6991ed7f7e9009033b9978 100644 (file)
--- a/src/payload_injector/test/payload_injector_test.cc
+++ b/src/payload_injector/test/payload_injector_test.cc
@@ -51,7 +51,11 @@ uint32_t Active::send_data(snort::Packet*, EncodeFlags, unsigned char const*, un
 
 void Active::block_session(snort::Packet*, bool) { }
 void DetectionEngine::disable_all(snort::Packet*) { }
-Flow::Flow() { memset(this, 0, sizeof(*this)); }
+Flow::Flow()
+{
+    gadget = nullptr;
+    flow_state = Flow::FlowState::SETUP;
+}
 Flow::~Flow() { }
 Packet::Packet(bool) { packet_flags = 0; flow = nullptr; }
 Packet::~Packet() { }