diff options
| author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-10-09 07:24:33 +0000 |
|---|---|---|
| committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-10-09 07:24:33 +0000 |
| commit | f53596396116d9cfb0f062c7c7704b36674483f0 (patch) | |
| tree | 042347d5d4c01107ff02979c33de22a372f7ff69 /epan/dissectors/packet-cisco-erspan.c | |
| parent | 5f7191b2fc53f43a80f66a73847e404f05e0f3a8 (diff) | |
From Didier Gautheron:
Dissectors using call_dissector() function inside a 'if (tree) {}' block.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4107
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30415 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-cisco-erspan.c')
| -rw-r--r-- | epan/dissectors/packet-cisco-erspan.c | 9 |
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 |