aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2017-06-13 20:37:11 -0400
committerAnders Broman <a.broman58@gmail.com>2017-06-14 05:37:27 +0000
commit26a6881014c85c935f2794f6eeb852849137c20a (patch)
treef83e1526d89eb92dcdadba5bfcbe5addcd0de392
parent50fa2d95833ec2e2b0de3000eda7b290fc23eaeb (diff)
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 <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r--plugins/docsis/packet-docsis.c4
1 files changed, 4 insertions, 0 deletions
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;
}