]> git.ipfire.org Git - thirdparty/snort3.git/commitdiff
Merge pull request #659 in SNORT/snort3 from dce_anal to master
authorRuss Combs (rucombs) <rucombs@cisco.com>
Thu, 6 Oct 2016 20:58:19 +0000 (16:58 -0400)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Thu, 6 Oct 2016 20:58:19 +0000 (16:58 -0400)
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

src/service_inspectors/dce_rpc/dce_co.cc

index 14556621738b3508fa1ad9c94b7d8a4722c0ec55..1fd323f8217369f277d6f2fb1b2c73773a9b81d9 100644 (file)
@@ -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)
     {