diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-05-19 04:54:36 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-05-19 04:54:36 +0000 |
| commit | b263e4934bb62aff50495d472484329a6bd23829 (patch) | |
| tree | bea8f6bda5798602a5390217358018f02f763de7 /packet-vlan.c | |
| parent | c43db40dc1315bfa84bc0ba7f91ffd31fc0ff272 (diff) | |
Add protection against 0-length FT_BYTES being added to proto_tree.
Convert ethertype() and dissect_null() to use tvbuff.
svn path=/trunk/; revision=1979
Diffstat (limited to 'packet-vlan.c')
| -rw-r--r-- | packet-vlan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packet-vlan.c b/packet-vlan.c index 1517e36b52..8bd1b12238 100644 --- a/packet-vlan.c +++ b/packet-vlan.c @@ -1,7 +1,7 @@ /* packet-vlan.c * Routines for VLAN 802.1Q ethernet header disassembly * - * $Id: packet-vlan.c,v 1.14 2000/05/16 06:21:33 gram Exp $ + * $Id: packet-vlan.c,v 1.15 2000/05/19 04:54:34 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -106,7 +106,7 @@ dissect_vlan(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) { dissect_llc(next_tvb, &pi, tree); } } else { - ethertype(encap_proto, offset+4, pd, fd, tree, vlan_tree, hf_vlan_etype); + ethertype(encap_proto, pi.compat_top_tvb, offset+4, &pi, tree, vlan_tree, hf_vlan_etype); } } |