From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Thu, 6 Oct 2016 20:58:19 +0000 (-0400)
Subject: Merge pull request #659 in SNORT/snort3 from dce_anal to master
X-Git-Tag: 3.0.0-233~235
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a960e628ba58de53fb14025ea31d7185c162947;p=thirdparty%2Fsnort3.git

Merge pull request #659 in SNORT/snort3 from dce_anal to master

Squashed commit of the following:

commit 381c2b9c9dd4ff87dd99c373e3fbc7d55a3f85f8
Author: Russ Combs <rucombs@cisco.com>
Date:   Thu Oct 6 15:11:39 2016 -0400

    fix static analysis issues
---

diff --git a/src/service_inspectors/dce_rpc/dce_co.cc b/src/service_inspectors/dce_rpc/dce_co.cc
index 145566217..1fd323f82 100644
--- a/src/service_inspectors/dce_rpc/dce_co.cc
+++ b/src/service_inspectors/dce_rpc/dce_co.cc
@@ -1323,6 +1323,10 @@ static void DCE2_CoReassemble(DCE2_SsnData* sd, DCE2_CoTracker* cot, DCE2_CoRpkt
 {
     DceRpcCoHdr* co_hdr = nullptr;
     Packet* rpkt = dce_co_reassemble(sd,cot,co_rtype,&co_hdr);
+
+    if ( !rpkt )
+        return;
+
     /* Push packet onto stack */
     if (DCE2_PushPkt(rpkt,sd) != DCE2_RET__SUCCESS)
     {