Skip to content

Commit aeba1a4

Browse files
committed
avcodec/msp2dec: Check available space in RLE decoder
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> (cherry picked from commit caaf463) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
1 parent d22550d commit aeba1a4

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

libavcodec/msp2dec.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ static int msp2_decode_frame(AVCodecContext *avctx,
7171
while (bytestream2_get_bytes_left(&gb) && x < width) {
7272
int size = bytestream2_get_byte(&gb);
7373
if (size) {
74+
size = FFMIN(size, bytestream2_get_bytes_left(&gb));
7475
memcpy(p->data[0] + y * p->linesize[0] + x, gb.buffer, FFMIN(size, width - x));
7576
bytestream2_skip(&gb, size);
7677
} else {

0 commit comments

Comments
 (0)