diff options
author | Michael Mann <mmann78@netscape.net> | 2014-10-10 19:22:45 -0400 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2014-10-10 23:24:18 +0000 |
commit | 6e42a729235b2e514bd9add18cfcb923cc11a883 (patch) | |
tree | a7235f8f16fd24f7e13d65bf9373c8f75845facb | |
parent | 5c5bf3b370b2d1e219d1297ea6d36055be2cd8e4 (diff) |
Dissection of sid28 needs null check.
Bug: 10542
Change-Id: I8fcfbbd96833af2c57754a4c8f96cf702972e22a
Reviewed-on: https://code.wireshark.org/review/4603
Reviewed-by: Michael Mann <mmann78@netscape.net>
-rw-r--r-- | epan/dissectors/packet-dcerpc-nt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-dcerpc-nt.c b/epan/dissectors/packet-dcerpc-nt.c index abc74372ac..ad64ad3a3a 100644 --- a/epan/dissectors/packet-dcerpc-nt.c +++ b/epan/dissectors/packet-dcerpc-nt.c @@ -1354,14 +1354,14 @@ dissect_ndr_nt_SID28(tvbuff_t *tvb, int offset, packet_info *pinfo, hf_nt_domain_sid); /* The dissected stuff can't be more than 28 bytes */ if ((newoffset - offset) > 28) { - item = proto_tree_get_parent(tree->last_child); + item = proto_tree_get_parent(tree? tree->last_child : NULL); expert_add_info(pinfo, item, &ei_dcerpc_nt_badsid); /* The rest of the dissection will most probably wrong as we are not dissecting what we expect */ return newoffset; } - /* No matter how much we used for the real dissection of the SID consume 28 bytes */ + /* No matter how much we used for the real dissection of the SID consume 28 bytes */ if (tree) { item = proto_tree_get_parent(tree->last_child); proto_item_set_len(item, 28); |