diff options
author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-06-25 17:35:17 +0000 |
---|---|---|
committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-06-25 17:35:17 +0000 |
commit | 31aa3869be36fdadc21ef6a84fb6881b169b4eb8 (patch) | |
tree | 01eb89169cbd73e62c4a1a40562ec96509fe632e /wiretap/etherpeek.c | |
parent | 238cfda4f4b4b93df6fc5bda0708a981cc659500 (diff) |
GCC 3.3 noticed that checking whether the length of the slice is > 65535
is pointless, as it's a 16-bit unsigned quantity. Remove those checks -
but note in a comment that WTAP_MAX_PACKET_SIZE must be at least 65535
(as there might well be link-layer types with packets at least that
large).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@7934 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'wiretap/etherpeek.c')
-rw-r--r-- | wiretap/etherpeek.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/wiretap/etherpeek.c b/wiretap/etherpeek.c index 0c1e592366..6cf684a5cb 100644 --- a/wiretap/etherpeek.c +++ b/wiretap/etherpeek.c @@ -2,7 +2,7 @@ * Routines for opening EtherPeek (and TokenPeek?) files * Copyright (c) 2001, Daniel Thompson <d.thompson@gmx.net> * - * $Id: etherpeek.c,v 1.22 2002/08/28 20:30:44 jmayer Exp $ + * $Id: etherpeek.c,v 1.23 2003/06/25 17:35:16 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -362,12 +362,6 @@ static gboolean etherpeek_read_v7(wtap *wth, int *err, long *data_offset) sliceLength = length; } - /* test for corrupt data */ - if (sliceLength > WTAP_MAX_PACKET_SIZE) { - *err = WTAP_ERR_BAD_RECORD; - return FALSE; - } - *data_offset = wth->data_offset; /* fill in packet header length values before slicelength may be @@ -512,12 +506,6 @@ static gboolean etherpeek_read_v56(wtap *wth, int *err, long *data_offset) sliceLength = length; } - /* test for corrupt data */ - if (sliceLength > WTAP_MAX_PACKET_SIZE) { - *err = WTAP_ERR_BAD_RECORD; - return FALSE; - } - *data_offset = wth->data_offset; /* fill in packet header values */ |