From 26a6881014c85c935f2794f6eeb852849137c20a Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Tue, 13 Jun 2017 20:37:11 -0400 Subject: DOCSIS: Prevent infinite loop from unknown FCParm. concatlen was not updated if FCParm was unknown, leading to an infinite loop. Bug: 13797 Change-Id: I1b64d757a369183a711f01b0b5cd1ba7aa0787bc Reviewed-on: https://code.wireshark.org/review/22120 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- plugins/docsis/packet-docsis.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'plugins') diff --git a/plugins/docsis/packet-docsis.c b/plugins/docsis/packet-docsis.c index 6f4b2a686e..30af37ae83 100644 --- a/plugins/docsis/packet-docsis.c +++ b/plugins/docsis/packet-docsis.c @@ -825,6 +825,10 @@ dissect_docsis (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* da concatpos = 0; break; } + default: + /* Unknown parameter, stop dissection */ + concatlen = 0; + break; } /* switch fcparm */ break; } -- cgit v1.2.3