]> git.sesse.net Git - ffmpeg/commitdiff
avformat/vividas: better check of current_sb_entry
authorMichael Niedermayer <michael@niedermayer.cc>
Wed, 21 Oct 2020 21:05:41 +0000 (23:05 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Fri, 30 Oct 2020 16:49:51 +0000 (17:49 +0100)
This is the simplest fix for the problem, it is possible to instead check
this when the variables are set and propagate errors and then fail earlier

Fixes: out of array access
Fixes: 26490/clusterfuzz-testcase-minimized-ffmpeg_dem_VIVIDAS_fuzzer-5723367078100992
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/vividas.c

index 6e93d96aef75a0adf2e448a7981cb604a4cc2fdc..83d0ed116787a33c81ac9fa87d22d8f50e0fd0d6 100644 (file)
@@ -673,6 +673,10 @@ static int viv_read_packet(AVFormatContext *s,
     if (!pb)
         return AVERROR(EIO);
     off = avio_tell(pb);
+
+    if (viv->current_sb_entry >= viv->n_sb_entries)
+        return AVERROR_INVALIDDATA;
+
     off += viv->sb_entries[viv->current_sb_entry].size;
 
     if (viv->sb_entries[viv->current_sb_entry].flag == 0) {