diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2012-09-09 20:10:14 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2012-09-09 20:10:14 +0000 |
| commit | 0a1c9c7b8ba3254229cd7b0325f5813e043d484f (patch) | |
| tree | fd7d302c909fcdc2ab92101eb8218ceddbd11d61 /epan/dissectors/packet-homeplug-av.c | |
| parent | 9c0dd8c7dc1363b0316429e54b33f9afdea9ec68 (diff) | |
From Florian Fainelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7707 :
Fix dissection of small Homeplug AV frames
svn path=/trunk/; revision=44823
Diffstat (limited to 'epan/dissectors/packet-homeplug-av.c')
| -rw-r--r-- | epan/dissectors/packet-homeplug-av.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/epan/dissectors/packet-homeplug-av.c b/epan/dissectors/packet-homeplug-av.c index 0334b3c48c..415fbd4c76 100644 --- a/epan/dissectors/packet-homeplug-av.c +++ b/epan/dissectors/packet-homeplug-av.c @@ -494,7 +494,6 @@ static gint ett_homeplug_av_tone_map_req = -1; static gint ett_homeplug_av_tone_map_cnf = -1; static gint ett_homeplug_av_tone_map_carrier = -1; -#define HOMEPLUG_AV_MIN_FRAME_SIZE 46 /* 60 - Ethernet SADDR + DADDR + Ethertype */ #define HOMEPLUG_AV_MMHDR_LEN 3 /* MM version (1) + MM type (2) */ #define HOMEPLUG_AV_PUBLIC_FRAG_COUNT_MASK 0x0F @@ -2859,10 +2858,8 @@ dissect_homeplug_av(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) cursor = ptvcursor_new(homeplug_av_tree, tvb, 0); - /* Check if we have enough data to process a complete frame */ - if (check_tvb_length(cursor, HOMEPLUG_AV_MIN_FRAME_SIZE) != TVB_LEN_SHORTEST && - /* Check if we have enough data to process the header */ - check_tvb_length(cursor, HOMEPLUG_AV_MMHDR_LEN) != TVB_LEN_SHORTEST) { + /* Check if we have enough data to process the header */ + if (check_tvb_length(cursor, HOMEPLUG_AV_MMHDR_LEN) != TVB_LEN_SHORTEST) { homeplug_av_mmtype = dissect_homeplug_av_mmhdr(cursor); |