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

Merge pull request #660 in SNORT/snort3 from smb_fix to master

Squashed commit of the following:

commit dc06d7b27c01eb1e9bcba68f57a8fe81059b121b
Author: mdagon <mdagon@cisco.com>
Date:   Thu Oct 6 15:10:53 2016 -0400

    dce_common.h analysis fix
---

diff --git a/src/service_inspectors/dce_rpc/dce_common.h b/src/service_inspectors/dce_rpc/dce_common.h
index 111cbff69..047ed5ff9 100644
--- a/src/service_inspectors/dce_rpc/dce_common.h
+++ b/src/service_inspectors/dce_rpc/dce_common.h
@@ -25,6 +25,7 @@
 #include "framework/counts.h"
 #include "framework/value.h"
 #include "protocols/packet.h"
+#include <assert.h>
 
 #include "dce_list.h"
 
@@ -296,6 +297,8 @@ inline int DCE2_SsnFromClient(Packet* p)
 
 inline DCE2_Policy DCE2_SsnGetPolicy(DCE2_SsnData* sd)
 {
+    assert(sd);
+
     if (DCE2_SsnFromClient(sd->wire_pkt))
         return sd->server_policy;
     else