Module: libav
Branch: release/0.8
Commit: 0f3381ad5bff4c21ba8631fcb54e7e26b6a96803

Author:    Luca Barbato <lu_z...@gentoo.org>
Committer: Reinhard Tartler <siret...@tauware.de>
Date:      Fri Sep 28 14:38:13 2012 +0200

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 <siret...@tauware.de>

---

 libavcodec/mpegaudiodec.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
index d902573..bb1baef 100644
--- a/libavcodec/mpegaudiodec.c
+++ b/libavcodec/mpegaudiodec.c
@@ -208,7 +208,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;

_______________________________________________
libav-commits mailing list
libav-commits@libav.org
https://lists.libav.org/mailman/listinfo/libav-commits

Reply via email to