summaryrefslogtreecommitdiff
path: root/libavcodec/dxv.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-09-30 08:02:11 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-09-30 22:44:43 +0200
commit97450d2b6a08769cbc4665bc66f6db9e8c5da2a4 (patch)
tree0a5721fc7caecaae2d2ea896b16f74eb12f43601 /libavcodec/dxv.c
parent75fefb1fb7ac8b423e08a8dca19b19884a325ebf (diff)
downloadffmpeg-97450d2b6a08769cbc4665bc66f6db9e8c5da2a4.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>
Diffstat (limited to 'libavcodec/dxv.c')
-rw-r--r--libavcodec/dxv.c3
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)