segafilm: Error out on impossible packet size
authorLuca Barbato <lu_zero@gentoo.org>
Tue, 13 Aug 2013 05:40:38 +0000 (07:40 +0200)
committerLuca Barbato <lu_zero@gentoo.org>
Sat, 24 Aug 2013 14:47:57 +0000 (16:47 +0200)
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit 5268bd2900effa59b51e0fede61aacde5e2f0b95)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
libavformat/segafilm.c

index 068d432..adf2475 100644 (file)
@@ -214,6 +214,8 @@ static int film_read_header(AVFormatContext *s)
         film->sample_table[i].sample_offset =
             data_offset + AV_RB32(&scratch[0]);
         film->sample_table[i].sample_size = AV_RB32(&scratch[4]);
+        if (film->sample_table[i].sample_size > INT_MAX / 4)
+            return AVERROR_INVALIDDATA;
         if (AV_RB32(&scratch[8]) == 0xFFFFFFFF) {
             film->sample_table[i].stream = film->audio_stream_index;
             film->sample_table[i].pts = audio_frame_counter;