]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/dxv: Check op_offset in dxv_decompress_cocg()
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 20 May 2019 23:33:03 +0000 (01:33 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 5 Jun 2019 11:19:59 +0000 (13:19 +0200)
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 <michael@niedermayer.cc>
libavcodec/dxv.c

index 6fe5516505a157b4767e746e98fc156aa0e20793..5fd1844094a4e891e61b5fc87ea3a4d22062ba61 100644 (file)
@@ -745,6 +745,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)