diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2011-11-02 19:36:33 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2011-11-02 19:36:33 +0000 |
| commit | b0ceb1cc770ed84cd6e959fa38411eb97c99b8ec (patch) | |
| tree | fc5b64fd4f819af3ecfce9f7976e039f18ec95ac | |
| parent | 083dbff6f9643b7602afc3df6e947c8413b96bd0 (diff) | |
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
| -rw-r--r-- | epan/dissectors/packet-cip.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c index 78f2a5b15d..462a7394cd 100644 --- a/epan/dissectors/packet-cip.c +++ b/epan/dissectors/packet-cip.c @@ -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"); |