summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2021-07-11 12:39:34 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2021-07-17 10:48:27 +0200
commit65b862ab59c4bfaae98be596b84a072f52444398 (patch)
tree02aead5104f73a407a0cf00af16791ba785abd91
parentadae546f2462006c6deae63ecd6402c3a2f2f566 (diff)
avformat/mxfdec: Check size for shrinking
av_shrink_packet() takes int size, so size must fit in int Fixes: out of array access Fixes: 35607/clusterfuzz-testcase-minimized-ffmpeg_dem_MXF_fuzzer-4875541323841536 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--libavformat/mxfdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index 16f5052452..f813408b3d 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -622,7 +622,7 @@ static int mxf_decrypt_triplet(AVFormatContext *s, AVPacket *pkt, KLVPacket *klv
return AVERROR_INVALIDDATA;
// enc. code
size = klv_decode_ber_length(pb);
- if (size < 32 || size - 32 < orig_size)
+ if (size < 32 || size - 32 < orig_size || (int)orig_size != orig_size)
return AVERROR_INVALIDDATA;
avio_read(pb, ivec, 16);
avio_read(pb, tmpbuf, 16);