From: Steve Chew (stechew) <stechew@cisco.com>
Date: Tue, 16 Jun 2020 22:32:03 +0000 (+0000)
Subject: Merge pull request #2269 in SNORT/snort3 from ~SHASLAD/snort3:fix_cov_series_part_9... 
X-Git-Tag: 3.0.1-5~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7934e6a841e154c4917aae50e6c4c31a0b1b67a5;p=thirdparty%2Fsnort3.git

Merge pull request #2269 in SNORT/snort3 from ~SHASLAD/snort3:fix_cov_series_part_9 to master

Squashed commit of the following:

commit d4809e1ea4e61828bd5a7b6267d743f63ceb2ebc
Author: Shashi Lad <shaslad@cisco.com>
Date:   Fri Jun 12 11:53:41 2020 -0400

    coverity: fixing issues found during coverity scan
---

diff --git a/src/log/log_text.cc b/src/log/log_text.cc
index 3b21cb5cf..4fc942c0d 100644
--- a/src/log/log_text.cc
+++ b/src/log/log_text.cc
@@ -341,8 +341,7 @@ void LogIPHeader(TextLog* log, Packet* p)
     if (is_ip6)
     {
         const ip::IP6Hdr* const ip6h = p->ptrs.ip_api.get_ip6h(); // nullptr if ipv4
-        const ip::IP6Frag* const ip6_frag = // nullptr if ipv4
-            (is_ip6 ? layer::get_inner_ip6_frag() : nullptr);
+        const ip::IP6Frag* const ip6_frag = layer::get_inner_ip6_frag();
 
         TextLog_Print(log, "%s TTL:%u TOS:0x%X ID:%u IpLen:%u DgmLen:%u",
             protocol_names[to_utype(p->get_ip_proto_next())],
diff --git a/src/log/u2_packet.h b/src/log/u2_packet.h
index 4651d933e..38165cd69 100644
--- a/src/log/u2_packet.h
+++ b/src/log/u2_packet.h
@@ -54,8 +54,8 @@ private:
     static const unsigned max_size =
         offset + sizeof(eth::EtherHdr) + sizeof(ip::IP6Hdr) + sizeof(tcp::TCPHdr);
 
-    uint16_t size;
-    uint16_t dsize;
+    uint16_t size = 0;
+    uint16_t dsize = 0;
 
     union
     {
diff --git a/src/packet_io/active.cc b/src/packet_io/active.cc
index a98f6d751..98de00ca6 100644
--- a/src/packet_io/active.cc
+++ b/src/packet_io/active.cc
@@ -111,7 +111,7 @@ static inline EncodeFlags GetFlags()
 // TBD strafed sequence numbers could be divided by window
 // scaling if present.
 
-static uint32_t Strafe(int i, uint32_t flags, const Packet* p)
+static uint64_t Strafe(int i, uint64_t flags, const Packet* p)
 {
     flags &= ENC_FLAG_VAL;
 
@@ -817,7 +817,7 @@ int Active::get_drop_reason_id()
     const auto iter = drop_reason_id_map.find(drop_reason);
     if ( iter != drop_reason_id_map.end() )
         return iter->second;
-            
+
     return default_drop_reason_id;
 }
 
diff --git a/src/service_inspectors/ssl/ips_ssl_state.cc b/src/service_inspectors/ssl/ips_ssl_state.cc
index a5db4ac5e..00b9c5374 100644
--- a/src/service_inspectors/ssl/ips_ssl_state.cc
+++ b/src/service_inspectors/ssl/ips_ssl_state.cc
@@ -61,7 +61,7 @@ public:
     EvalStatus eval(Cursor&, Packet*) override;
 
 private:
-    SslStateRuleOptionData ssod;
+    SslStateRuleOptionData ssod = {};
 };
 
 //-------------------------------------------------------------------------
@@ -171,7 +171,7 @@ public:
     { return DETECT; }
 
 public:
-    SslStateRuleOptionData ssod;
+    SslStateRuleOptionData ssod = {};
 };
 
 bool SslStateModule::begin(const char*, int, SnortConfig*)
diff --git a/src/service_inspectors/ssl/ips_ssl_version.cc b/src/service_inspectors/ssl/ips_ssl_version.cc
index 2f846c9ea..5b1026e0a 100644
--- a/src/service_inspectors/ssl/ips_ssl_version.cc
+++ b/src/service_inspectors/ssl/ips_ssl_version.cc
@@ -61,7 +61,7 @@ public:
     EvalStatus eval(Cursor&, Packet*) override;
 
 private:
-    SslVersionRuleOptionData svod;
+    SslVersionRuleOptionData svod = {};
 };
 
 //-------------------------------------------------------------------------
@@ -171,7 +171,7 @@ public:
     { return DETECT; }
 
 public:
-    SslVersionRuleOptionData svod;
+    SslVersionRuleOptionData svod = {};
 };
 
 bool SslVersionModule::begin(const char*, int, SnortConfig*)
diff --git a/tools/u2spewfoo/u2spewfoo.cc b/tools/u2spewfoo/u2spewfoo.cc
index 2d869fd20..d8229ee33 100644
--- a/tools/u2spewfoo/u2spewfoo.cc
+++ b/tools/u2spewfoo/u2spewfoo.cc
@@ -72,6 +72,10 @@ static u2iterator* new_iterator(char* filename)
 
 static inline void free_iterator(u2iterator* it)
 {
+
+    if (!it)
+        return;
+
     if (it->file)
         fclose(it->file);
     if (it->filename)