aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-cisco-erspan.c
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2009-10-09 07:24:33 +0000
committerAnders Broman <anders.broman@ericsson.com>2009-10-09 07:24:33 +0000
commit4d2e653901ab7bb17c9ed3269a930569d8ada5eb (patch)
tree042347d5d4c01107ff02979c33de22a372f7ff69 /epan/dissectors/packet-cisco-erspan.c
parent46aa5c44de5b62cc061840b29903a63bc3790445 (diff)
From Didier Gautheron:
Dissectors using call_dissector() function inside a 'if (tree) {}' block. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4107 svn path=/trunk/; revision=30415
Diffstat (limited to 'epan/dissectors/packet-cisco-erspan.c')
-rw-r--r--epan/dissectors/packet-cisco-erspan.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/epan/dissectors/packet-cisco-erspan.c b/epan/dissectors/packet-cisco-erspan.c
index ce940770e1..4cc00f4556 100644
--- a/epan/dissectors/packet-cisco-erspan.c
+++ b/epan/dissectors/packet-cisco-erspan.c
@@ -128,10 +128,13 @@ dissect_erspan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(erspan_tree, hf_erspan_unknown4, tvb, offset, 4,
FALSE);
offset += 4;
-
- eth_tvb = tvb_new_subset_remaining(tvb, offset);
- call_dissector(ethnofcs_handle, eth_tvb, pinfo, tree);
}
+ else {
+ offset += 8;
+ }
+
+ eth_tvb = tvb_new_subset_remaining(tvb, offset);
+ call_dissector(ethnofcs_handle, eth_tvb, pinfo, tree);
}
void