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

FTDI MPSSE: Replace asserts with expert items. 

Replace a couple of REPORT_DISSECTOR_BUG instances with
proto_tree_add_expert_format. This should hopefully keep the fuzz
builder from complaining.

Bug: 16597
Change-Id: I0ec281bf69244f339cdcbbe49632130f17124419
Reviewed-on: https://code.wireshark.org/review/37600
Petri-Dish: Tomasz Moń <desowin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Gerald Combs 2020-06-29 11:26:52 -07:00 committed by Anders Broman
parent 9e3671562c
commit d000ff3e6c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/packet-ftdi-mpsse.c
View File

@ -72,6 +72,7 @@ static gint ett_mpsse_direction = -1;
static expert_field ei_undecoded = EI_INIT;
static expert_field ei_response_without_command = EI_INIT;
static expert_field ei_skipped_response_data = EI_INIT;
static expert_field ei_reassembly_unavailable = EI_INIT;
static dissector_handle_t ftdi_mpsse_handle;
@ -973,7 +974,7 @@ dissect_ftdi_mpsse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da
if (need_reassembly)
{
/* TODO: Implement desegmentation in FTDI FT and ask for one more segment */
REPORT_DISSECTOR_BUG("Reassembly is not implemented yet. Dissection will get out of sync.");
proto_tree_add_expert(main_tree, pinfo, &ei_reassembly_unavailable, tvb, offset, -1);
}
}
else if (pinfo->p2p_dir == P2P_DIR_RECV)
@ -1011,7 +1012,7 @@ dissect_ftdi_mpsse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da
if (need_reassembly)
{
/* TODO: Implement desegmentation in FTDI FT and ask for one more segment */
REPORT_DISSECTOR_BUG("Reassembly is not implemented yet. Dissection will get out of sync.");
proto_tree_add_expert(main_tree, pinfo, &ei_reassembly_unavailable, tvb, offset, -1);
}
}
@ -1240,6 +1241,7 @@ proto_register_ftdi_mpsse(void)
{ &ei_undecoded, { "ftdi-mpsse.undecoded", PI_UNDECODED, PI_WARN, "Not dissected yet (report to wireshark.org)", EXPFILL }},
{ &ei_response_without_command, { "ftdi-mpsse.response_without_command", PI_PROTOCOL, PI_ERROR, "Unable to associate response with command (response without command?)", EXPFILL }},
{ &ei_skipped_response_data, { "ftdi-mpsse.skipped_response_data", PI_PROTOCOL, PI_WARN, "Skipped response data while looking for Bad Command response", EXPFILL }},
{ &ei_reassembly_unavailable, { "ftdi-mpsse.reassembly_unavailable", PI_UNDECODED, PI_ERROR, "Data source dissector does not support reassembly. Dissection will get out of sync.", EXPFILL }},
};
static gint *ett[] = {