From b263e4934bb62aff50495d472484329a6bd23829 Mon Sep 17 00:00:00 2001 From: Gilbert Ramirez Date: Fri, 19 May 2000 04:54:36 +0000 Subject: 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 --- packet-vlan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packet-vlan.c') 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 @@ -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); } } -- cgit v1.2.3