oggspeexparse: fix array overread

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago · a0f659b275
parent 12fcc626d6
commit a0f659b275
1 changed files with 5 additions and 0 deletions
--- a/libavformat/oggparsespeex.c
+++ b/libavformat/oggparsespeex.c
@ -58,6 +58,11 @@ static int speex_header(AVFormatContext *s, int idx) {
        st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
        st->codec->codec_id = AV_CODEC_ID_SPEEX;

+        if (os->psize < 68) {
+            av_log(s, AV_LOG_ERROR, "speex packet too small\n");
+            return AVERROR_INVALIDDATA;
+        }
+
        st->codec->sample_rate = AV_RL32(p + 36);
        st->codec->channels = AV_RL32(p + 48);
        if (st->codec->channels < 1 || st->codec->channels > 2) {