Merge pull request #646 in SNORT/snort3 from static_analysis_fixes to master

Squashed commit of the following:

commit 9828dcff1ed69362b71da63b25a3adff33287452
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Thu Sep 29 08:08:47 2016 -0400

    Two assert()'s to overcome static analysis errors.

diff --git a/src/network_inspectors/appid/service_plugins/service_base.cc b/src/network_inspectors/appid/service_plugins/service_base.cc
index 67283b96e5be5818843ef2d9ae9d8950cef8b5a1..333c4d82e1250e80ea78bee26c8298490fc04402 100644 (file)
--- a/src/network_inspectors/appid/service_plugins/service_base.cc
+++ b/src/network_inspectors/appid/service_plugins/service_base.cc
@@ -1072,6 +1072,7 @@ static inline RNAServiceElement* AppIdGetServiceByPattern(const Packet* pkt, IpP
         {
             ServiceMatch** tmp;
             smOrderedListSize *= 2;
+            assert(smOrderedListSize > 0);
             tmp = (ServiceMatch**)realloc(smOrderedList,
                     smOrderedListSize * sizeof(*smOrderedList));
             if (!tmp)

diff --git a/src/service_inspectors/dce_rpc/dce_smb_utils.cc b/src/service_inspectors/dce_rpc/dce_smb_utils.cc
index d2145ba5485e04269abc6ddf724e52329f881000..bb3d2444109fb725f265f8497e3a3f37b82955ef 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_smb_utils.cc
+++ b/src/service_inspectors/dce_rpc/dce_smb_utils.cc
@@ -1954,6 +1954,7 @@ void DCE2_FileDetect()
 
 static void DCE2_SmbSetNewFileAPIFileTracker(DCE2_SmbSsnData* ssd)
 {
+    assert(ssd);
     DCE2_SmbFileTracker* ftracker = &ssd->ftracker;
 
     while (ftracker != nullptr)