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

From Roland Knall: 

Avoiding the fuzz-test crash, but still allowing for large parts of CIP to be dissected.

ref https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6519

svn path=/trunk/; revision=39718
This commit is contained in:
Anders Broman 2011-11-02 19:36:33 +00:00
parent 083dbff6f9
commit b0ceb1cc77
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
epan/dissectors/packet-cip.c
View File

@ -3512,6 +3512,10 @@ dissect_cip_multiple_service_packet_rsp(tvbuff_t *tvb, packet_info *pinfo, proto
cip_req_info_t *cip_req_info, *mr_single_req_info;
mr_mult_req_info_t *mr_mult_req_info = NULL;
/* XXX DISABLE CIP MULTIPLE SERVICE PACKET RSP --until the fuzz failures stop */
expert_add_info_format(pinfo, item, PI_MALFORMED, PI_ERROR, "Multiple Service Packet service disabled - see Bug #6519 for details");
return;
if (tvb_reported_length_remaining(tvb, offset) < 2)
{
expert_add_info_format(pinfo, item, PI_MALFORMED, PI_ERROR, "Multiple Service Packet service missing Number of Services field");
@ -4941,9 +4945,6 @@ dissect_cip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
enip_request_info_t *enip_info;
cip_req_info_t *preq_info;
/* XXX DISABLE CIP DISSECTOR--until the fuzz failures stop */
return 0;
/* Make entries in Protocol column and Info column on summary display */
col_set_str(pinfo->cinfo, COL_PROTOCOL, "CIP");