[SCM] libav/master: Check if an mp3 header is using a reserved sample rate.

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit fcbcc561e0fdc95a7dd48b92db53846726aec27e
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date:   Sun Jun 22 13:11:32 2014 -0400

    Check if an mp3 header is using a reserved sample rate.
    
    Fixes an invalid read past the end of avpriv_mpa_freq_tab.
    Fixes divide-by-zero due to sample_rate being set to 0.
    
    Bug-Id: 705
    
    CC:libav-stable at libav.org
    (cherry picked from commit 44127546b0a81dc9dd6190739a62d48f0044c6f3)
    Signed-off-by: Luca Barbato <lu_zero at gentoo.org>

diff --git a/libavcodec/mpegaudiodecheader.c b/libavcodec/mpegaudiodecheader.c
index 69dda45..25e7319 100644
--- a/libavcodec/mpegaudiodecheader.c
+++ b/libavcodec/mpegaudiodecheader.c
@@ -24,6 +24,8 @@
  * MPEG Audio header decoder.
  */
 
+#include "libavutil/common.h"
+
 #include "avcodec.h"
 #include "mpegaudio.h"
 #include "mpegaudiodata.h"
@@ -45,6 +47,8 @@ int avpriv_mpegaudio_decode_header(MPADecodeHeader *s, uint32_t header)
     s->layer = 4 - ((header >> 17) & 3);
     /* extract frequency */
     sample_rate_index = (header >> 10) & 3;
+    if (sample_rate_index >= FF_ARRAY_ELEMS(avpriv_mpa_freq_tab))
+        sample_rate_index = 0;
     sample_rate = avpriv_mpa_freq_tab[sample_rate_index] >> (s->lsf + mpeg25);
     sample_rate_index += 3 * (s->lsf + mpeg25);
     s->sample_rate_index = sample_rate_index;

-- 
Libav/FFmpeg packaging