From: Masud Hasan (mashasan) <mashasan@cisco.com>
Date: Tue, 19 May 2020 21:43:18 +0000 (+0000)
Subject: Merge pull request #2218 in SNORT/snort3 from ~MASHASAN/snort3:coverity_fixes_2 to... 
X-Git-Tag: 3.0.1-4~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4ace7dc93933049a41e39172198ee012875b318;p=thirdparty%2Fsnort3.git

Merge pull request #2218 in SNORT/snort3 from ~MASHASAN/snort3:coverity_fixes_2 to master

Squashed commit of the following:

commit a9c8c023afbbc552331e94306dacac3697069058
Author: Masud Hasan <mashasan@cisco.com>
Date:   Tue May 19 14:05:52 2020 -0400

    network_inspectors: Fixing a few minor issues reported by Coverity
---

diff --git a/src/network_inspectors/binder/binder.cc b/src/network_inspectors/binder/binder.cc
index 50756ad54..0b336f7d8 100644
--- a/src/network_inspectors/binder/binder.cc
+++ b/src/network_inspectors/binder/binder.cc
@@ -953,15 +953,12 @@ void Binder::show(const SnortConfig*) const
     if ( !bindings.size() )
         return;
 
-    for (auto& b : bindings)
+    for (const auto& b : bindings)
     {
-        auto when = b->when;
-        auto use = b->use;
-
         std::call_once(once, []{ ConfigLogger::log_option("bindings"); });
 
-        auto bind_when = "{ when = " + to_string(when) + ",";
-        auto bind_use = "use = " + to_string(use) + " }";
+        auto bind_when = "{ when = " + to_string(b->when) + ",";
+        auto bind_use = "use = " + to_string(b->use) + " }";
         ConfigLogger::log_list("", bind_when.c_str(), "   ");
         ConfigLogger::log_list("", bind_use.c_str(), "   ", true);
     }
diff --git a/src/network_inspectors/perf_monitor/perf_tracker.cc b/src/network_inspectors/perf_monitor/perf_tracker.cc
index 10ab1d07d..9ba112d35 100644
--- a/src/network_inspectors/perf_monitor/perf_tracker.cc
+++ b/src/network_inspectors/perf_monitor/perf_tracker.cc
@@ -75,7 +75,9 @@ PerfTracker::PerfTracker(PerfConfig* config, const char* tracker_name)
 #ifdef UNIT_TEST
         case PerfFormat::MOCK: formatter = new MockFormatter(tracker_name); break;
 #endif
-        default: break;
+        default:
+            FatalError("Perfmonitor: Can't initialize output format\n");
+            break;
     }
 
     if ( config->output == PerfOutput::TO_FILE )
diff --git a/src/network_inspectors/rna/rna_logger.cc b/src/network_inspectors/rna/rna_logger.cc
index 4dc82481d..8110d8e59 100644
--- a/src/network_inspectors/rna/rna_logger.cc
+++ b/src/network_inspectors/rna/rna_logger.cc
@@ -50,8 +50,6 @@ bool RnaLogger::log(uint16_t type, uint16_t subtype, const Packet* p, RnaTracker
     RnaLoggerEvent rle(type, subtype, ht, src_mac);
     if ( src_ip and (!IN6_IS_ADDR_V4MAPPED(src_ip) or src_ip->s6_addr32[3]) )
         rle.ip = src_ip;
-    else
-        rle.ip = nullptr;
 
     if (ht)
     {
diff --git a/src/network_inspectors/rna/rna_logger.h b/src/network_inspectors/rna/rna_logger.h
index a1d549a6e..ddb44e795 100644
--- a/src/network_inspectors/rna/rna_logger.h
+++ b/src/network_inspectors/rna/rna_logger.h
@@ -39,7 +39,7 @@ struct RnaLoggerEvent : public Event
     uint16_t subtype;
     const RnaTracker* ht;
     const uint8_t* mac;
-    const struct in6_addr* ip;
+    const struct in6_addr* ip = nullptr;
     void* cond_var = nullptr;
 };