diff options
author | Evan Huus <eapache@gmail.com> | 2013-06-22 21:01:03 +0000 |
---|---|---|
committer | Evan Huus <eapache@gmail.com> | 2013-06-22 21:01:03 +0000 |
commit | a1eae659f06af9025c3a75704e3f249f69a5dcce (patch) | |
tree | 59243d38bb8275afa346bd0edded246eb9285c2b /epan/dissectors/packet-btrfcomm.c | |
parent | bfa8d9af75c63df5f8aa78148442901d8b10540e (diff) |
Only do a tree lookup if we have a tree to look up in.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8833
svn path=/trunk/; revision=50116
Diffstat (limited to 'epan/dissectors/packet-btrfcomm.c')
-rw-r--r-- | epan/dissectors/packet-btrfcomm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c index cfd65ea0af..fe9c2ef851 100644 --- a/epan/dissectors/packet-btrfcomm.c +++ b/epan/dissectors/packet-btrfcomm.c @@ -619,7 +619,9 @@ dissect_btrfcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) key[9].length = 0; key[9].key = NULL; - service_info = (service_info_t *) wmem_tree_lookup32_array_le(sdp_service_infos, key); + if (sdp_service_infos) { + service_info = (service_info_t *) wmem_tree_lookup32_array_le(sdp_service_infos, key); + } if (service_info && service_info->interface_id == l2cap_data->interface_id && service_info->adapter_id == l2cap_data->adapter_id && service_info->sdp_psm == SDP_PSM_DEFAULT && |