osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Check for valid docsis_handle, and use data_handle if not. 

This fixes bug 5839.

svn path=/trunk/; revision=36681
This commit is contained in:
Stig Bjørlykke 2011-04-17 17:47:39 +00:00
parent df3293c9d4
commit 722dba0495
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
epan/dissectors/packet-mp2t.c
View File

@ -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;