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-llc.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-llc.c')
| -rw-r--r-- | packet-llc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packet-llc.c b/packet-llc.c index daf391eb4c..4b143a3ac9 100644 --- a/packet-llc.c +++ b/packet-llc.c @@ -2,7 +2,7 @@ * Routines for IEEE 802.2 LLC layer * Gilbert Ramirez <gram@xiexie.org> * - * $Id: packet-llc.c,v 1.60 2000/05/16 04:44:12 gram Exp $ + * $Id: packet-llc.c,v 1.61 2000/05/19 04:54:33 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -357,8 +357,8 @@ dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) OUI_ENCAP_ETHER and an Ethernet packet type for AARP packets. */ if (XDLC_IS_INFORMATION(control)) { - ethertype(etype, offset, pd, - pinfo->fd, tree, llc_tree, hf_llc_type); + ethertype(etype, tvb, 8, + pinfo, tree, llc_tree, hf_llc_type); } else dissect_data_tvb(next_tvb, pinfo, tree); break; |