[SCM] libav/experimental: make sure the mpeg audio header is valid before passing it to ff_mpegaudio_decode_header()

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 5b5bd7c9ee692026e67126e3e9f1883fc7701319
Author: Andreas Öman <andreas at lonelycoder.com>
Date:   Sun Nov 4 19:52:08 2007 +0000

    make sure the mpeg audio header is valid before passing it to ff_mpegaudio_decode_header()
    
    Originally committed as revision 10925 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mp3.c b/libavformat/mp3.c
index 9a0b020..18691ff 100644
--- a/libavformat/mp3.c
+++ b/libavformat/mp3.c
@@ -435,7 +435,11 @@ static void mp3_parse_vbr_tags(AVFormatContext *s, AVStream *st, offset_t base)
     const offset_t xing_offtbl[2][2] = {{32, 17}, {17,9}};
     MPADecodeContext c;
 
-    ff_mpegaudio_decode_header(&c, get_be32(&s->pb));
+    v = get_be32(&s->pb);
+    if(ff_mpa_check_header(v) < 0)
+      return;
+
+    ff_mpegaudio_decode_header(&c, v);
     if(c.layer != 3)
         return;
 

-- 
Libav/FFmpeg packaging