]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/msp2dec: Check available space in RLE decoder
authorMichael Niedermayer <michael@niedermayer.cc>
Tue, 6 Apr 2021 21:14:08 +0000 (23:14 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 8 Apr 2021 14:59:27 +0000 (16:59 +0200)
Fixes: out of array read
Fixes: 32968/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MSP2_fuzzer-5315296027082752
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/msp2dec.c

index cc548d218a9d158ef9194c900426e9c0b986a69f..16c5ac6f0254477febf2c10b93ff5b791c8969ad 100644 (file)
@@ -71,6 +71,7 @@ static int msp2_decode_frame(AVCodecContext *avctx,
         while (bytestream2_get_bytes_left(&gb) && x < width) {
             int size = bytestream2_get_byte(&gb);
             if (size) {
+                size = FFMIN(size, bytestream2_get_bytes_left(&gb));
                 memcpy(p->data[0] + y * p->linesize[0] + x, gb.buffer, FFMIN(size, width - x));
                 bytestream2_skip(&gb, size);
             } else {