diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2017-05-12 20:39:40 +0200 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2017-05-12 19:43:09 +0000 |
commit | d566531ae5874bfd63c2755cba95cd63b7a4a189 (patch) | |
tree | 67570b2e99e315515b3f4fdaa03ba6176bb9b581 | |
parent | 900695547b096b1be34fb58bea98c0474e9c72ab (diff) | |
download | wireshark-d566531ae5874bfd63c2755cba95cd63b7a4a189.tar.gz |
BT L2CAP: avoid a division by 0
Bug: 13701
Change-Id: Ie433ecd932dcfc40fa6d3fdc3fa00139c64584a2
Reviewed-on: https://code.wireshark.org/review/21618
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r-- | epan/dissectors/packet-btl2cap.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c index 256194fac3..2fd7364432 100644 --- a/epan/dissectors/packet-btl2cap.c +++ b/epan/dissectors/packet-btl2cap.c @@ -1684,7 +1684,8 @@ dissect_connparamrequest(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr item = proto_tree_add_item(tree, hf_btl2cap_slave_latency, tvb, offset, 2, ENC_LITTLE_ENDIAN); slave_latency = tvb_get_letohs(tvb, offset); - if(slave_latency >= 500 || slave_latency > 10.0 * tvb_get_letohs(tvb, offset + 2) / (max_interval *1.25)) + if(slave_latency >= 500 || max_interval == 0 || + slave_latency > 10.0 * tvb_get_letohs(tvb, offset + 2) / (max_interval *1.25)) expert_add_info(pinfo, item, &ei_btl2cap_parameter_mismatch); offset += 2; @@ -3318,7 +3319,7 @@ proto_register_btl2cap(void) }; static ei_register_info ei[] = { - { &ei_btl2cap_parameter_mismatch, { "btl2cap.parameter_mismatch", PI_PROTOCOL, PI_WARN, "Unexpected frame", EXPFILL }}, + { &ei_btl2cap_parameter_mismatch, { "btl2cap.parameter_mismatch", PI_PROTOCOL, PI_WARN, "Parameter mismatch", EXPFILL }}, { &ei_btl2cap_sdulength_bad, { "btl2cap.sdulength.bad", PI_MALFORMED, PI_WARN, "SDU length bad", EXPFILL }}, { &ei_btl2cap_length_bad, { "btl2cap.length.bad", PI_MALFORMED, PI_WARN, "Length too short", EXPFILL }}, { &ei_btl2cap_unknown_command_code, { "btl2cap.unknown_command_code", PI_PROTOCOL, PI_WARN, "Unknown Command Code", EXPFILL }}, |