]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/ffv1dec: Check if trailer is available
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 31 Jan 2021 20:22:11 +0000 (21:22 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Sat, 13 Mar 2021 20:02:31 +0000 (21:02 +0100)
Fixes: out of array read
Fixes: 29750/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FFV1_fuzzer-4808377272238080.fuzz
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/ffv1dec.c

index 0a3f425493716fdb2c63dde2a51e10a61576bba8..8516fef5d74ad091077a30374cfc47a3cf4f5b92 100644 (file)
@@ -888,8 +888,10 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac
         int trailer = 3 + 5*!!f->ec;
         int v;
 
-        if (i || f->version > 2) v = AV_RB24(buf_p-trailer) + trailer;
-        else                     v = buf_p - c->bytestream_start;
+        if (i || f->version > 2) {
+            if (trailer > buf_p - buf) v = INT_MAX;
+            else                       v = AV_RB24(buf_p-trailer) + trailer;
+        } else                         v = buf_p - c->bytestream_start;
         if (buf_p - c->bytestream_start < v) {
             av_log(avctx, AV_LOG_ERROR, "Slice pointer chain broken\n");
             ff_thread_report_progress(&f->picture, INT_MAX, 0);