summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <[email protected]>2019-05-21 01:33:03 +0200
committerMichael Niedermayer <[email protected]>2019-06-27 17:50:47 +0200
commit43afeaa08652543fd44f993001b2be01aca122a6 (patch)
treea2fa903cd10c08396727cf4217afd31be9af229d
parent04c3e3d4e257a7e46e7e699f5d26f849837f907d (diff)
avcodec/dxv: Check op_offset in dxv_decompress_cocg()
Fixes: signed integer overflow: -2147483648 - 12 cannot be represented in type 'int' Fixes: 14732/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DXV_fuzzer-5735273129836544 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 8e520843dd76a644c019134ac7b17eba9f1118b3) Signed-off-by: Michael Niedermayer <[email protected]>
-rw-r--r--libavcodec/dxv.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/dxv.c b/libavcodec/dxv.c
index aef5ec19dd..7ae3315493 100644
--- a/libavcodec/dxv.c
+++ b/libavcodec/dxv.c
@@ -743,6 +743,9 @@ static int dxv_decompress_cocg(DXVContext *ctx, GetByteContext *gb,
int skip0, skip1, oi0 = 0, oi1 = 0;
int ret, state0 = 0, state1 = 0;
+ if (op_offset < 12)
+ return AVERROR_INVALIDDATA;
+
dst = tex_data;
bytestream2_skip(gb, op_offset - 12);
if (op_size0 > max_op_size0)