highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/hdrdec: Check for end of input in decompress()

Browse Source 
Fixes: Timeout
Fixes: 54386/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HDR_fuzzer-5053598268784640

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2022-12-25 21:54:33 +01:00
parent 7fab58647c
commit 902a49c4cd
No known key found for this signature in database
GPG Key ID: B18E8928B3948D64
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/hdrdec.c
View File

@ -58,6 +58,8 @@ static int decompress(uint8_t *scanline, int w, GetByteContext *gb, const uint8_
int rshift = 0;
while (w > 0) {
if (bytestream2_get_bytes_left(gb) < 4)
return AVERROR_INVALIDDATA;
scanline[0] = bytestream2_get_byte(gb);
scanline[1] = bytestream2_get_byte(gb);
scanline[2] = bytestream2_get_byte(gb);
@ -143,13 +145,17 @@ static int hdr_decode_frame(AVCodecContext *avctx, AVFrame *p,
int i;
if (width < MINELEN || width > MAXELEN) {
decompress(scanline, width, &gb, scanline);
ret = decompress(scanline, width, &gb, scanline);
if (ret < 0)
return ret;
goto convert;
}
i = bytestream2_peek_byte(&gb);
if (i != 2) {
decompress(scanline, width, &gb, scanline);
ret = decompress(scanline, width, &gb, scanline);
if (ret < 0)
return ret;
goto convert;
}
bytestream2_skip(&gb, 1);
@ -161,7 +167,9 @@ static int hdr_decode_frame(AVCodecContext *avctx, AVFrame *p,
if (scanline[1] != 2 || scanline[2] & 128) {
scanline[0] = 2;
scanline[3] = i;
decompress(scanline + 4, width - 1, &gb, scanline);
ret = decompress(scanline + 4, width - 1, &gb, scanline);
if (ret < 0)
return ret;
goto convert;
}