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

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 50756ad548314b36d5d1c45ad000821a50ce612e..0b336f7d8ddd9381a82dcc16005c4dbad8c5e42c 100644 (file)
--- 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 10ab1d07d814e8be0743b1164684bd8603d0f903..9ba112d359377a0004f96e530bd65cfd39ea17b2 100644 (file)
--- 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 4dc82481d467584ba9c71acffb07f9bb06dce663..8110d8e59c8dc7aeb66d9f37fb71d84c8c55a936 100644 (file)
--- 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 a1d549a6e188127405aeb7f81940208f2c080995..ddb44e795cb27fef2775e7c640cb6adbe4154624 100644 (file)
--- 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;
 };