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.c | |
| parent | c43db40dc1315bfa84bc0ba7f91ffd31fc0ff272 (diff) | |
| download | wireshark-b263e4934bb62aff50495d472484329a6bd23829.tar.gz wireshark-b263e4934bb62aff50495d472484329a6bd23829.tar.bz2 wireshark-b263e4934bb62aff50495d472484329a6bd23829.zip | |
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.c')
| -rw-r--r-- | packet.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,7 +1,7 @@ /* packet.c * Routines for packet disassembly * - * $Id: packet.c,v 1.85 2000/05/18 09:05:55 guy Exp $ + * $Id: packet.c,v 1.86 2000/05/19 04:54:34 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -1187,7 +1187,7 @@ dissect_packet(union pseudo_header *pseudo_header, const u_char *pd, dissect_tr(tvb, &pi, tree); break; case WTAP_ENCAP_NULL : - dissect_null(pd, fd, tree); + dissect_null(tvb, &pi, tree); break; case WTAP_ENCAP_PPP : dissect_ppp(pd, 0, fd, tree); |