aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-06-27 00:29:06 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-09-24 12:28:26 +0200
commit8c7d5fcfc32d65951039ab2bb78947a41bdd96c4 (patch)
tree5e70c11c8002d1ef6f4e0219349cc2903518467c
parentc7c0229bebbb2ea6eec6eddb75774eca3e33d075 (diff)
downloadffmpeg-8c7d5fcfc32d65951039ab2bb78947a41bdd96c4.tar.gz
avcodec/dxv: Check op_offset in both directions
Fixes: signed integer overflow: 61 + 2147483647 cannot be represented in type 'int' Fixes: 15311/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DXV_fuzzer-5742552826773504 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/dxv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dxv.c b/libavcodec/dxv.c
index ae79de981f..8d5e4b1c6c 100644
--- a/libavcodec/dxv.c
+++ b/libavcodec/dxv.c
@@ -745,7 +745,7 @@ 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)
+ if (op_offset < 12 || op_offset - 12 > bytestream2_get_bytes_left(gb))
return AVERROR_INVALIDDATA;
dst = tex_data;