aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-fc.c
diff options
context:
space:
mode:
authorMartin Kaiser <wireshark@kaiser.cx>2013-11-27 21:52:44 +0000
committerMartin Kaiser <wireshark@kaiser.cx>2013-11-27 21:52:44 +0000
commitbe4e248a071b3db1b88130c3c32119b4be71ada1 (patch)
tree0bb1c923d57d57dec60e1563134bcb4c495d08d2 /epan/dissectors/packet-fc.c
parentc3a8eca1c8da47166d0af4c4b9ab3951d05f9f04 (diff)
try to fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9485
fc dissector rejects the packet if data parameter is empty svn path=/trunk/; revision=53617
Diffstat (limited to 'epan/dissectors/packet-fc.c')
-rw-r--r--epan/dissectors/packet-fc.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c
index c8694554aa..a2b0faae18 100644
--- a/epan/dissectors/packet-fc.c
+++ b/epan/dissectors/packet-fc.c
@@ -1231,6 +1231,9 @@ dissect_fc (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
{
fc_data_t* fc_data = (fc_data_t*)data;
+ if (!fc_data)
+ return 0;
+
dissect_fc_helper (tvb, pinfo, tree, FALSE, fc_data);
return tvb_length(tvb);
}
@@ -1240,6 +1243,9 @@ dissect_fc_ifcp (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data
{
fc_data_t* fc_data = (fc_data_t*)data;
+ if (!fc_data)
+ return 0;
+
dissect_fc_helper (tvb, pinfo, tree, TRUE, fc_data);
return tvb_length(tvb);
}