summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2016-11-26 14:00:11 +0100
committerPascal Quantin <pascal.quantin@gmail.com>2016-11-26 17:40:30 +0000
commitf975020121d613762c6ffa3fe5852869c29f574d (patch)
tree171f4a5f33d2e2a52d232c9b1d71a1edf6fac797 /plugins
parentd0fa82b825c15fbd9f3b6037f3d9ad4fc78d87fd (diff)
downloadwireshark-f975020121d613762c6ffa3fe5852869c29f574d.tar.gz
DOCSIS: fix an infinite recursion introduced in g3e1828e
Bug: 13179 Change-Id: I4c510dab463f7c223bcaabd3157ca791dd86d690 Reviewed-on: https://code.wireshark.org/review/18958 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Seth Alexander <pxsdaemon@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'plugins')
-rw-r--r--plugins/docsis/packet-docsis.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/plugins/docsis/packet-docsis.c b/plugins/docsis/packet-docsis.c
index 8345d62702..2628ef80a6 100644
--- a/plugins/docsis/packet-docsis.c
+++ b/plugins/docsis/packet-docsis.c
@@ -456,7 +456,10 @@ dissect_ehdr (tvbuff_t * tvb, proto_tree * tree, packet_info * pinfo)
break;
case EH_EXTENDED:
/* Extended EH Element, one or more Sub EH fields may follow; simply recurse */
- dissect_ehdr (tvb, ehdr_tree, pinfo);
+ {
+ tvbuff_t *subset = tvb_new_subset_remaining(tvb, pos);
+ dissect_ehdr (subset, ehdr_tree, pinfo);
+ }
break;
default:
if (len > 0)