diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-09-18 22:40:49 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-09-19 21:54:02 +0000 |
| commit | e489df5024acc86b0bd3c9f41844b06ff7560d24 (patch) | |
| tree | 9e86fc9b2ddf02df33ea626f4e205c9b110e9b73 /epan/dissectors/packet-dcerpc-ndr.c | |
| parent | 9fce9ba18886cb13555697ced309e77d45d03ea5 (diff) | |
Don't assert that values fit in 32 bits if the NDR64 flag is set.
For now, this just pacifies fuzz-testing. If real world examples have this, there needs to be a drastic overhaul to support fields that could be either 32 or 64-bit values.
Bug:9329
Change-Id: I3e28808ca0291868a5f84258b0ee1e2a922703c2
Reviewed-on: https://code.wireshark.org/review/4189
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-dcerpc-ndr.c')
| -rw-r--r-- | epan/dissectors/packet-dcerpc-ndr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-dcerpc-ndr.c b/epan/dissectors/packet-dcerpc-ndr.c index 4f8b293ceb..cabf6f3686 100644 --- a/epan/dissectors/packet-dcerpc-ndr.c +++ b/epan/dissectors/packet-dcerpc-ndr.c @@ -355,7 +355,7 @@ dissect_ndr_duint32(tvbuff_t *tvb, gint offset, packet_info *pinfo, offset += 4 - (offset % 4); } return dissect_dcerpc_uint64(tvb, offset, pinfo, - tree, drep, hfindex, pdata); + tree, di, drep, hfindex, pdata); } /* uint64 : hyper @@ -383,7 +383,7 @@ dissect_ndr_uint64(tvbuff_t *tvb, gint offset, packet_info *pinfo, offset += padding; } return dissect_dcerpc_uint64(tvb, offset, pinfo, - tree, drep, hfindex, pdata); + tree, di, drep, hfindex, pdata); } int @@ -402,7 +402,7 @@ PIDL_dissect_uint64_val(tvbuff_t *tvb, gint offset, packet_info *pinfo, offset += 8 - (offset % 8); } offset = dissect_dcerpc_uint64(tvb, offset, pinfo, - tree, drep, hfindex, &val); + tree, di, drep, hfindex, &val); if (param&PIDL_SET_COL_INFO) { header_field_info *hf_info; |