diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-09-30 08:02:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-12-31 19:51:55 +0100 |
| commit | 3a40d5ab2f86e352867883f0580f95ef2e9d2a85 (patch) | |
| tree | efe6c091833af1a49a4c90f2badaf482d795dcd7 | |
| parent | 6f2723e54b6529aee720f26c90c2f59daf9caa50 (diff) | |
| download | ffmpeg-3a40d5ab2f86e352867883f0580f95ef2e9d2a85.tar.gz | |
avcodec/dxv: Check op_offset in dxv_decompress_yo()
Fixes: signed integer overflow: -2147483648 - 8 cannot be represented in type 'int'
Fixes: 17745/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DXV_fuzzer-5734628463214592
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>
(cherry picked from commit 97450d2b6a08769cbc4665bc66f6db9e8c5da2a4)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/dxv.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/dxv.c b/libavcodec/dxv.c index 8d5e4b1c6c..d67412a3a2 100644 --- a/libavcodec/dxv.c +++ b/libavcodec/dxv.c @@ -799,6 +799,9 @@ static int dxv_decompress_yo(DXVContext *ctx, GetByteContext *gb, uint8_t *dst, *table0[256] = { 0 }, *table1[256] = { 0 }; int ret, state = 0, skip, oi = 0, v, vv; + if (op_offset < 8 || op_offset - 8 > bytestream2_get_bytes_left(gb)) + return AVERROR_INVALIDDATA; + dst = tex_data; bytestream2_skip(gb, op_offset - 8); if (op_size > max_op_size) |