Merge pull request #1476 in SNORT/snort3 from ~MDAGON/snort3:cppcheck_3 to master

Squashed commit of the following:

commit de59e7f90507b91e9c129bb17b38f276e5f0a83c
Author: Maya Dagon <mdagon@cisco.com>
Date:   Thu Dec 20 12:01:48 2018 -0500

    piglet_plugins: fix cppcheck warnings

commit 494e5fb32b00187bb2b85530223f3c52a10c0580
Author: Maya Dagon <mdagon@cisco.com>
Date:   Thu Dec 20 11:45:06 2018 -0500

    snort2lua: fix cppcheck warning

commit 25e3f25d215c8d85821dfd8260c19f6f2224d0ce
Author: Maya Dagon <mdagon@cisco.com>
Date:   Wed Dec 19 16:25:50 2018 -0500

    ports: fix cppcheck warning

    Fix local variable po_print_buf shadows outer variable

commit 971e72fc949aad1377b1a2b5a2bda5da88ee938c
Author: Maya Dagon <mdagon@cisco.com>
Date:   Wed Dec 19 16:17:52 2018 -0500

    stream: fix for non-boolean value returned

commit ff8c2f913d49f43e78b2a4c4ad6f30593feec895
Author: Maya Dagon <mdagon@cisco.com>
Date:   Wed Dec 19 16:14:07 2018 -0500

    tcp_connector: fix cppcheck warning

    Fix Local variable tcp_connector shadows outer variable

commit 6581af2400c71ac6dc60b4848c2006809bf47014
Author: Maya Dagon <mdagon@cisco.com>
Date:   Wed Dec 19 16:09:41 2018 -0500

    file_connector: fix cppcheck warning

    Fix for local variable file_connector shadows outer variable

diff --git a/src/connectors/file_connector/file_connector.cc b/src/connectors/file_connector/file_connector.cc
index 39a46fc1214b9577488dcfbe5f7244afaa2fa37f..0b6a3db2008c7af401ea6334f755a4c1fc2281e3 100644 (file)
--- a/src/connectors/file_connector/file_connector.cc
+++ b/src/connectors/file_connector/file_connector.cc
@@ -238,28 +238,28 @@ static void mod_dtor(Module* m)
 static Connector* file_connector_tinit_transmit(std::string filename,
     FileConnectorConfig* cfg)
 {
-    FileConnector* file_connector = new FileConnector(cfg);
+    FileConnector* file_conn = new FileConnector(cfg);
     std::string pathname;
 
     filename += "_transmit";
     (void)get_instance_file(pathname, filename.c_str());
-    file_connector->file.open(pathname,
+    file_conn->file.open(pathname,
         (std::ios::out | (cfg->text_format ? (std::ios::openmode)0 : std::ios::binary)) );
 
-    return file_connector;
+    return file_conn;
 }
 
 static Connector* file_connector_tinit_receive(std::string filename,
     FileConnectorConfig* cfg)
 {
-    FileConnector* file_connector = new FileConnector(cfg);
+    FileConnector* file_conn = new FileConnector(cfg);
     std::string pathname;
 
     filename += "_receive";
     (void)get_instance_file(pathname, filename.c_str());
-    file_connector->file.open(pathname, (std::ios::in | std::ios::binary) );
+    file_conn->file.open(pathname, (std::ios::in | std::ios::binary) );
 
-    return file_connector;
+    return file_conn;
 }
 
 // Create a per-thread object
@@ -282,10 +282,10 @@ static Connector* file_connector_tinit(ConnectorConfig* config)
 
 static void file_connector_tterm(Connector* connector)
 {
-    FileConnector* file_connector = (FileConnector*)connector;
+    FileConnector* file_conn = (FileConnector*)connector;
 
-    file_connector->file.close();
-    delete file_connector;
+    file_conn->file.close();
+    delete file_conn;
 }
 
 static ConnectorCommon* file_connector_ctor(Module* m)

diff --git a/src/connectors/tcp_connector/tcp_connector.cc b/src/connectors/tcp_connector/tcp_connector.cc
index d7bc95a376a87b15a0bd1561070adb25c22da38a..ff8ba0137e210ec77ce0e0413aea7c7d273e4840 100644 (file)
--- a/src/connectors/tcp_connector/tcp_connector.cc
+++ b/src/connectors/tcp_connector/tcp_connector.cc
@@ -345,8 +345,8 @@ static TcpConnector* tcp_connector_tinit_call(TcpConnectorConfig* cfg, const cha
         return nullptr;
     }
 
-    TcpConnector* tcp_connector = new TcpConnector(cfg, sfd);
-    return tcp_connector;
+    TcpConnector* tcp_conn = new TcpConnector(cfg, sfd);
+    return tcp_conn;
 }
 
 static TcpConnector* tcp_connector_tinit_answer(TcpConnectorConfig* cfg, const char* port)
@@ -415,8 +415,8 @@ static TcpConnector* tcp_connector_tinit_answer(TcpConnectorConfig* cfg, const c
         return nullptr;
     }
 
-    TcpConnector* tcp_connector  = new TcpConnector(cfg, peer_sfd);
-    return tcp_connector;
+    TcpConnector* tcp_conn = new TcpConnector(cfg, peer_sfd);
+    return tcp_conn;
 }
 
 // Create a per-thread object
@@ -435,23 +435,23 @@ static Connector* tcp_connector_tinit(ConnectorConfig* config)
 
     snprintf(port_string, sizeof(port_string), "%5hu", static_cast<uint16_t>(cfg->base_port + instance));
 
-    TcpConnector* tcp_connector;
+    TcpConnector* tcp_conn;
 
     if ( cfg->setup == TcpConnectorConfig::Setup::CALL )
-        tcp_connector = tcp_connector_tinit_call(cfg, port_string);
+        tcp_conn = tcp_connector_tinit_call(cfg, port_string);
     else if ( cfg->setup == TcpConnectorConfig::Setup::ANSWER )
-        tcp_connector = tcp_connector_tinit_answer(cfg, port_string);
+        tcp_conn = tcp_connector_tinit_answer(cfg, port_string);
     else
-        tcp_connector = nullptr;
+        tcp_conn = nullptr;
 
-    return tcp_connector;
+    return tcp_conn;
 }
 
 static void tcp_connector_tterm(Connector* connector)
 {
-    TcpConnector* tcp_connector = (TcpConnector*)connector;
+    TcpConnector* tcp_conn = (TcpConnector*)connector;
 
-    delete tcp_connector;
+    delete tcp_conn;
 }
 
 static ConnectorCommon* tcp_connector_ctor(Module* m)

diff --git a/src/piglet_plugins/pp_event_iface.cc b/src/piglet_plugins/pp_event_iface.cc
index 5b0b564329a1a6e48401644985b9d461da4bafb6..faf2c49fb62508bca4f97438ff41512419dc1aed 100644 (file)
--- a/src/piglet_plugins/pp_event_iface.cc
+++ b/src/piglet_plugins/pp_event_iface.cc
@@ -97,7 +97,7 @@ static const luaL_Reg methods[] =
 
             if ( si )
             {
-                Lua::ManageStack ms(L);
+                Lua::ManageStack lua_ms(L);
                 lua_newtable(L);
                 Lua::Table si_table(L, lua_gettop(L));
 
@@ -123,14 +123,14 @@ static const luaL_Reg methods[] =
             auto& self = EventIface.get(L);
             luaL_checktype(L, 2, LUA_TTABLE);
 
-            Lua::Table table(L, 2);
-            table.get_field_to_stack("sig_info");
+            Lua::Table new_table(L, 2);
+            new_table.get_field_to_stack("sig_info");
 
             auto* si = const_cast<SigInfo*>(self.sig_info);
 
             if ( si && lua_istable(L, lua_gettop(L)) )
             {
-                Lua::ManageStack ms(L);
+                Lua::ManageStack lua_ms(L);
                 Lua::Table si_table(L, lua_gettop(L));
 
                 si_table.get_field("generator", si->gid);

diff --git a/src/piglet_plugins/pp_raw_buffer_iface.cc b/src/piglet_plugins/pp_raw_buffer_iface.cc
index ed68644a50045c7d167d6b8b698a8d7074ed2956..fe915cfbac5064eaba331a3144c63c95d61d4692 100644 (file)
--- a/src/piglet_plugins/pp_raw_buffer_iface.cc
+++ b/src/piglet_plugins/pp_raw_buffer_iface.cc
@@ -33,11 +33,11 @@
 
 static int init_from_string(lua_State* L)
 {
-    Lua::Args args(L);
+    Lua::Args l_args(L);
 
     size_t len = 0;
-    const char* s = args[1].check_string(len);
-    size_t size = args[2].opt_size(len);
+    const char* s = l_args[1].check_string(len);
+    size_t size = l_args[2].opt_size(len);
 
     // instantiate and adjust size if necessary
     RawBufferIface.create(L, s, len).resize(size, '\0');
@@ -47,9 +47,9 @@ static int init_from_string(lua_State* L)
 
 static int init_from_size(lua_State* L)
 {
-    Lua::Args args(L);
+    Lua::Args l_args(L);
 
-    size_t size = args[1].opt_size();
+    size_t size = l_args[1].opt_size();
 
     RawBufferIface.create(L, size, '\0');
 
@@ -62,9 +62,9 @@ static const luaL_Reg methods[] =
         "new",
         [](lua_State* L)
         {
-            Lua::Args args(L);
+            Lua::Args lua_args(L);
 
-            if ( args[1].is_string() )
+            if ( lua_args[1].is_string() )
                 return init_from_string(L);
 
             return init_from_size(L);
@@ -83,10 +83,10 @@ static const luaL_Reg methods[] =
         "resize",
         [](lua_State* L)
         {
-            Lua::Args args(L);
+            Lua::Args lua_args(L);
 
             auto& self = RawBufferIface.get(L, 1);
-            size_t new_size = args[2].check_size();
+            size_t new_size = lua_args[2].check_size();
 
             self.resize(new_size, '\0');
 
@@ -97,13 +97,13 @@ static const luaL_Reg methods[] =
         "write",
         [](lua_State* L)
         {
-            Lua::Args args(L);
+            Lua::Args lua_args(L);
 
             auto& self = RawBufferIface.get(L, 1);
 
             size_t len = 0;
-            const char* s = args[2].check_string(len);
-            size_t offset = args[3].opt_size();
+            const char* s = lua_args[2].check_string(len);
+            size_t offset = lua_args[3].opt_size();
 
             size_t required = offset + len;
             if ( self.size() < required )
@@ -118,19 +118,19 @@ static const luaL_Reg methods[] =
         "read",
         [](lua_State* L)
         {
-            Lua::Args args(L);
+            Lua::Args lua_args(L);
 
             auto& self = RawBufferIface.get(L, 1);
 
-            if ( args.count > 2 )
+            if ( lua_args.count > 2 )
             {
-                size_t start = args[2].check_size(self.size());
-                size_t end = args[3].check_size(start, self.size());
+                size_t start = lua_args[2].check_size(self.size());
+                size_t end = lua_args[3].check_size(start, self.size());
                 lua_pushlstring(L, self.data() + start, end - start);
             }
             else
             {
-                size_t end = args[2].opt_size(self.size(), self.size());
+                size_t end = lua_args[2].opt_size(self.size(), self.size());
                 lua_pushlstring(L, self.data(), end);
             }
 

diff --git a/src/ports/port_object.cc b/src/ports/port_object.cc
index cb4d851b2fc05ae252b8a0d2fac663c805c80b0e..c587273ef5bf3edbbee8a48124731808fcb3da3b 100644 (file)
--- a/src/ports/port_object.cc
+++ b/src/ports/port_object.cc
@@ -572,10 +572,10 @@ void PortObjectPrintEx(PortObject* po, po_print_f print_index_map)
     unsigned i;
 
     /* static for printing so we don't put so many bytes on the stack */
-    static char po_print_buf[snort::MAX_PORTS];  // FIXIT-L delete this; replace with local stringstream
+    static char print_buf[snort::MAX_PORTS];  // FIXIT-L delete this; replace with local stringstream
 
-    int bufsize = sizeof(po_print_buf);
-    po_print_buf[0] = '\0';
+    int bufsize = sizeof(print_buf);
+    print_buf[0] = '\0';
 
     if ( !po )
         return;
@@ -586,22 +586,22 @@ void PortObjectPrintEx(PortObject* po, po_print_f print_index_map)
     if ( !po->rule_list->count )
         return;
 
-    SnortSnprintfAppend(po_print_buf, bufsize, " PortObject ");
+    SnortSnprintfAppend(print_buf, bufsize, " PortObject ");
 
     if ( po->name )
     {
-        SnortSnprintfAppend(po_print_buf, bufsize, "%s ", po->name);
+        SnortSnprintfAppend(print_buf, bufsize, "%s ", po->name);
     }
 
-    SnortSnprintfAppend(po_print_buf, bufsize,
+    SnortSnprintfAppend(print_buf, bufsize,
         " Id:%d  Ports:%u Rules:%u\n {\n",
         po->id, po->item_list->count,po->rule_list->count);
 
-    SnortSnprintfAppend(po_print_buf, bufsize, "  Ports [\n  ");
+    SnortSnprintfAppend(print_buf, bufsize, "  Ports [\n  ");
 
     if ( PortObjectHasAny(po) )
     {
-        SnortSnprintfAppend(po_print_buf, bufsize, "any");
+        SnortSnprintfAppend(print_buf, bufsize, "any");
     }
     else
     {
@@ -609,10 +609,10 @@ void PortObjectPrintEx(PortObject* po, po_print_f print_index_map)
             poi != nullptr;
             poi=(PortObjectItem*)sflist_next(&pos) )
         {
-            PortObjectItemPrint(poi, po_print_buf, bufsize);
+            PortObjectItemPrint(poi, print_buf, bufsize);
         }
     }
-    SnortSnprintfAppend(po_print_buf, bufsize, "  ]\n");
+    SnortSnprintfAppend(print_buf, bufsize, "  ]\n");
 
     rlist = RuleListToSortedArray(po->rule_list);
     if (!rlist )
@@ -620,27 +620,27 @@ void PortObjectPrintEx(PortObject* po, po_print_f print_index_map)
         return;
     }
 
-    SnortSnprintfAppend(po_print_buf, bufsize, "  Rules [ \n ");
+    SnortSnprintfAppend(print_buf, bufsize, "  Rules [ \n ");
     for (i=0; i<po->rule_list->count; i++)
     {
         if ( print_index_map )
         {
-            print_index_map(rlist[i], po_print_buf, bufsize);
+            print_index_map(rlist[i], print_buf, bufsize);
         }
         else
         {
-            SnortSnprintfAppend(po_print_buf, bufsize, " %d",rlist[i]);
+            SnortSnprintfAppend(print_buf, bufsize, " %d",rlist[i]);
         }
         k++;
         if ( k == 25 )
         {
             k=0;
-            SnortSnprintfAppend(po_print_buf, bufsize, " \n ");
+            SnortSnprintfAppend(print_buf, bufsize, " \n ");
         }
     }
-    SnortSnprintfAppend(po_print_buf, bufsize, "  ]\n }\n");
+    SnortSnprintfAppend(print_buf, bufsize, "  ]\n }\n");
 
-    snort::LogMessage("%s", po_print_buf);
+    snort::LogMessage("%s", print_buf);
     snort_free(rlist);
 }
 

diff --git a/src/stream/stream.h b/src/stream/stream.h
index f1316eb05aac7d6eb44525e275cc4355972357f8..cae1963842d50f3781ed55ff5f5f68dc0c8b6be1 100644 (file)
--- a/src/stream/stream.h
+++ b/src/stream/stream.h
@@ -210,7 +210,7 @@ public:
         Flow*, const HostAttributeEntry*, int direction);
 
     static bool is_midstream(Flow* flow)
-    { return flow->ssn_state.session_flags & SSNFLAG_MIDSTREAM; }
+    { return ((flow->ssn_state.session_flags & SSNFLAG_MIDSTREAM) != 0); }
 
     // Get the TTL value used at session setup
     // Set outer=false to get inner ip ttl for ip in ip; else outer=true

diff --git a/tools/snort2lua/helpers/parse_cmd_line.cc b/tools/snort2lua/helpers/parse_cmd_line.cc
index a5c48feb2610b3827fcd738d169f7d0c16073bf3..d2a017466f9f8bc13f477949128c5b504fd14b2b 100644 (file)
--- a/tools/snort2lua/helpers/parse_cmd_line.cc
+++ b/tools/snort2lua/helpers/parse_cmd_line.cc
@@ -489,22 +489,22 @@ static void help_args(const char* /*pfx*/, const char* /*val*/)
             if (name.size() > name_field_len)
                 std::cout << "\n" << std::left << std::setw(name_field_len) << " ";
 
-            std::string help = p->help;
+            std::string help_str = p->help;
             bool first_line = true;
 
-            while (!help.empty())
+            while (!help_str.empty())
             {
-                std::size_t len = util::get_substr_length(help, data_field_len);
+                std::size_t len = util::get_substr_length(help_str, data_field_len);
 
                 if (first_line)
                     first_line = false;
                 else
                     std::cout << "\n" << std::setw(name_field_len) << " ";
 
-                std::cout << std::left << Markup::escape(help.substr(0, len));
+                std::cout << std::left << Markup::escape(help_str.substr(0, len));
 
-                if (len < help.size())
-                    help = help.substr(len + 1);
+                if (len < help_str.size())
+                    help_str = help_str.substr(len + 1);
                 else
                     break;
             }