diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2011-04-17 17:47:39 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2011-04-17 17:47:39 +0000 |
| commit | 722dba0495e24e735556e2700e2eec34a8322fb8 (patch) | |
| tree | d96d4beb3d543647f4c1b74639b76f7871179854 /epan/dissectors/packet-mp2t.c | |
| parent | df3293c9d467769013e23ed72216f53b08da0ded (diff) | |
Check for valid docsis_handle, and use data_handle if not.
This fixes bug 5839.
svn path=/trunk/; revision=36681
Diffstat (limited to 'epan/dissectors/packet-mp2t.c')
| -rw-r--r-- | epan/dissectors/packet-mp2t.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c index 0711d26750..3119108c56 100644 --- a/epan/dissectors/packet-mp2t.c +++ b/epan/dissectors/packet-mp2t.c @@ -417,7 +417,10 @@ mp2t_depi_docsis_process_payload(tvbuff_t *tvb, gint offset, packet_info *pinfo, "DOCSIS MAC Frame: %u bytes", mac_frame_len); dmpt_tree = proto_item_add_subtree(ti, ett_dmpt); next_tvb = tvb_new_subset(tvb, offset, -1, -1); - call_dissector(docsis_handle, next_tvb, pinfo, dmpt_tree); + if (docsis_handle) + call_dissector(docsis_handle, next_tvb, pinfo, dmpt_tree); + else + call_dissector(data_handle, next_tvb, pinfo, dmpt_tree); offset += mac_frame_len; remaining_length -= mac_frame_len; |