aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2012-09-28 14:38:13 +0200
committerReinhard Tartler <siretart@tauware.de>2013-01-04 07:43:38 +0100
commitec6719f6551db6e93d8af9bffdaf0163b5d59b5b (patch)
treebfd75c7946bb594293046fec68f9836ae90bff14
parent11ecd8574a2edd482c687123f374f22c3390c6dc (diff)
downloadffmpeg-ec6719f6551db6e93d8af9bffdaf0163b5d59b5b.tar.gz
mpegaudiodec: fix short_start calculation
The value should be always 3, as it follows from the specification. Fix a stack buffer overflow in exponents_from_scale_factors as reported by asan. Thanks to Dale Curtis for the sample vector. (cherry picked from commit 97cfa55eea39cef30abe14682c56c1e4e7f6f10d) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
-rw-r--r--libavcodec/mpegaudiodec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
index 033d76e049..fd94fb1dcc 100644
--- a/libavcodec/mpegaudiodec.c
+++ b/libavcodec/mpegaudiodec.c
@@ -210,7 +210,7 @@ static void ff_compute_band_indexes(MPADecodeContext *s, GranuleDef *g){
else
g->long_end = 4; /* 8000 Hz */
- g->short_start = 2 + (s->sample_rate_index != 8);
+ g->short_start = 3;
} else {
g->long_end = 0;
g->short_start = 0;