[FFmpeg-cvslog] mpegaudiodec: fix short_start calculation

Luca Barbato git at videolan.org
Mon Feb 11 12:41:05 CET 2013


ffmpeg | branch: release/0.5 | Luca Barbato <lu_zero at gentoo.org> | Fri Sep 28 14:38:13 2012 +0200| [5235db68c062581b8625b4a432d96101f1a23f44] | committer: Reinhard Tartler

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 at tauware.de>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5235db68c062581b8625b4a432d96101f1a23f44
---

 libavcodec/mpegaudiodec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
index e7bbd5d..c95a571 100644
--- a/libavcodec/mpegaudiodec.c
+++ b/libavcodec/mpegaudiodec.c
@@ -173,7 +173,7 @@ 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;



More information about the ffmpeg-cvslog mailing list