diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2015-11-28 10:54:16 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-28 19:22:56 +0000 |
| commit | b8fa3d463c1bdd9b84c897441e7a5c8ad1f0f292 (patch) | |
| tree | b187915fc8976126c2f3a2fa6f3dbd981ff1c925 /wiretap | |
| parent | 41d4dabc291757b5aa880ca98d2c3eb5d8bc3fe3 (diff) | |
vwr: fix buffer overrun in getRate
Bug: 11789
Change-Id: Ieba9f32928b91be5d07b25bf54005155f7cc79f6
Reviewed-on: https://code.wireshark.org/review/12245
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/vwr.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/wiretap/vwr.c b/wiretap/vwr.c index 6f082a5f4c..3b9659322d 100644 --- a/wiretap/vwr.c +++ b/wiretap/vwr.c @@ -2273,7 +2273,10 @@ static float getRate( guint8 plcpType, guint8 mcsIndex, guint16 rflags, guint8 n float symbol_tx_time, bitrate = 0.0f; if (plcpType == 0) - bitrate = canonical_rate_legacy[mcsIndex]; + { + if (mcsIndex < G_N_ELEMENTS(canonical_rate_legacy)) + bitrate = canonical_rate_legacy[mcsIndex]; + } else if (plcpType == 1 || plcpType == 2) { if ( rflags & FLAGS_CHAN_SHORTGI) @@ -2295,8 +2298,8 @@ static float getRate( guint8 plcpType, guint8 mcsIndex, guint16 rflags, guint8 n else symbol_tx_time = 4.0f; - /* Check for the out of range mcsIndex. Should never happen, but if mcs index is greater than 9 assume 9 is the value */ - if (mcsIndex > 9) mcsIndex = 9; + /* Check for the out of range mcsIndex. Should never happen, but if mcs index is greater than 9 assume 9 is the value */ + if (mcsIndex > 9) mcsIndex = 9; if ( rflags & FLAGS_CHAN_40MHZ ) bitrate = (canonical_ndbps_40_vht[ mcsIndex ] * nss) / symbol_tx_time; else if (rflags & FLAGS_CHAN_80MHZ ) |