xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-25 04:30:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

avcodec/notchlc: Check uncompressed size against input for LZ4

Browse Source 
Fixes: OOM
Fixes: 26168/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_NOTCHLC_fuzzer-6019839015256064

Equation is based on LZ4_COMPRESSBOUND from lz4.h
Suggested-by: Paul
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2020-10-13 22:44:21 +02:00
parent 0d088a47ca
commit 51002362c4
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/notchlc.c
View File

@ -490,6 +490,11 @@ static int decode_frame(AVCodecContext *avctx,
bytestream2_init(gb, s->lzf_buffer, uncompressed_size); bytestream2_init(gb, s->lzf_buffer, uncompressed_size);
} else if (s->format == 1) { } else if (s->format == 1) {
unsigned remaining = bytestream2_get_bytes_left(gb);
if (remaining > 0x7E000000U || remaining + remaining/255 + 16 < uncompressed_size)
return AVERROR_INVALIDDATA;
av_fast_padded_malloc(&s->uncompressed_buffer, &s->uncompressed_size, av_fast_padded_malloc(&s->uncompressed_buffer, &s->uncompressed_size,
uncompressed_size); uncompressed_size);
if (!s->uncompressed_buffer) if (!s->uncompressed_buffer)