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-eth.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-eth.c')
| -rw-r--r-- | packet-eth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packet-eth.c b/packet-eth.c index 03af90be48..303940dc5b 100644 --- a/packet-eth.c +++ b/packet-eth.c @@ -1,7 +1,7 @@ /* packet-eth.c * Routines for ethernet packet disassembly * - * $Id: packet-eth.c,v 1.39 2000/05/17 03:05:39 gram Exp $ + * $Id: packet-eth.c,v 1.40 2000/05/19 04:54:33 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -285,7 +285,7 @@ dissect_eth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dissect_llc(next_tvb, &pi, tree); break; case ETHERNET_II: - ethertype(etype, eth_offset, pd, pinfo->fd, tree, fh_tree, hf_eth_type); + ethertype(etype, tvb, ETH_HEADER_SIZE, pinfo, tree, fh_tree, hf_eth_type); break; } |