diff options
| author | Michal Labedzki <michal.labedzki@tieto.com> | 2015-08-05 16:25:16 +0000 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-08-05 17:29:54 +0000 |
| commit | 3b2e6d961056658fde556b74cc342a37f188aec9 (patch) | |
| tree | e423d0c42c4945c2e7ef033ba29aa8c30deeb16e /epan/dissectors/packet-btrfcomm.c | |
| parent | 53a80334bcb3ca40a5aaef504e2aca0f04bcc9f3 (diff) | |
Revert "[MSVC 2015] Fix errors seen with the released version by reverting the code to what failed on the RC version *sigh*"
Reverted commit break DecodeAs for Bluetooth, also caused crashes.
This reverts commit 2221153a9cc083a50248a72a4b4009908d84e38b.
Change-Id: Idb91747b986f110fffa3444f8c52d800c128e141
Reviewed-on: https://code.wireshark.org/review/9877
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-btrfcomm.c')
| -rw-r--r-- | epan/dissectors/packet-btrfcomm.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c index c6d212e036..f6e5143b11 100644 --- a/epan/dissectors/packet-btrfcomm.c +++ b/epan/dissectors/packet-btrfcomm.c @@ -279,9 +279,14 @@ static void btrfcomm_directed_channel_prompt(packet_info *pinfo, gchar* result) static gpointer btrfcomm_directed_channel_value(packet_info *pinfo) { + gulong *value_data; - return (gpointer)p_get_proto_data(pinfo->pool, pinfo, proto_btrfcomm, PROTO_DATA_BTRFCOMM_DIRECTED_CHANNEL); + value_data = (gulong *) p_get_proto_data(pinfo->pool, pinfo, proto_btrfcomm, PROTO_DATA_BTRFCOMM_DIRECTED_CHANNEL); + if (value_data) + return (gpointer) *value_data; + + return NULL; } static dissector_handle_t |