new samr compiled as a test by the samba4 pidl compiler from mainline
authorsahlberg <sahlberg@f5534014-38df-0310-8fa8-9805f1628bb7>
Wed, 7 Oct 2009 07:01:55 +0000 (07:01 +0000)
committersahlberg <sahlberg@f5534014-38df-0310-8fa8-9805f1628bb7>
Wed, 7 Oct 2009 07:01:55 +0000 (07:01 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30383 f5534014-38df-0310-8fa8-9805f1628bb7

epan/dissectors/packet-dcerpc-samr.c

index b983d44478f567f0f625733b48dda4815094432e..fb1c21e170351b9c52f42a5939034535e0aa3f9b 100644 (file)
@@ -2136,7 +2136,6 @@ static int
 cnf_dissect_sec_desc_buf_(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep)
 {
        guint64 len;
-       guint32 len32;
        dcerpc_info *di = NULL;
        e_ctx_hnd *polhnd = NULL;
        dcerpc_call_value *dcv = NULL;
@@ -2149,10 +2148,6 @@ cnf_dissect_sec_desc_buf_(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t
        }
        offset = dissect_ndr_uint3264 (tvb, offset, pinfo, tree, drep,
                hf_samr_sec_desc_buf_len, &len);
-
-       DISSECTOR_ASSERT(len<=G_MAXUINT32);
-       len32 = (guint32)len;
-
        dcv = (dcerpc_call_value *)di->call_data;
        if(dcv){
                polhnd = dcv->pol;
@@ -2178,8 +2173,8 @@ cnf_dissect_sec_desc_buf_(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t
                ami=&samr_alias_access_mask_info;
                break;
        }
-       dissect_nt_sec_desc(tvb, offset, pinfo, tree, drep, TRUE, len32, ami);
-       offset += len32;
+       dissect_nt_sec_desc(tvb, offset, pinfo, tree, drep, TRUE, len, ami);
+       offset += len;
        return offset;
 }
 static int