From: Michael Altizer (mialtize) <mialtize@cisco.com>
Date: Thu, 29 Sep 2016 18:26:43 +0000 (-0400)
Subject: Merge pull request #646 in SNORT/snort3 from static_analysis_fixes to master
X-Git-Tag: 3.0.0-233~252
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea9d87def05054374ffa40ab5f4d89e29da7ccf0;p=thirdparty%2Fsnort3.git

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 67283b96e..333c4d82e 100644
--- 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 d2145ba54..bb3d24441 100644
--- 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)