Commit 5b5bd7c9 authored by Andreas Öman's avatar Andreas Öman

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
parent f9def9cc
...@@ -435,7 +435,11 @@ static void mp3_parse_vbr_tags(AVFormatContext *s, AVStream *st, offset_t base) ...@@ -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}}; const offset_t xing_offtbl[2][2] = {{32, 17}, {17,9}};
MPADecodeContext c; 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) if(c.layer != 3)
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment