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 111cbff6962f72aa673025d294a95fd50145bd60..047ed5ff90b8d4d0bc8a959283ea84ac8d1e6df2 100644 (file)
--- 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