diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2021-07-11 12:39:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-10-06 14:41:41 +0200 |
| commit | a52577dae5ce0dade9ef772264ca6c442a8ea5db (patch) | |
| tree | d88747e548714c75f09575b05a50242a157511b1 /libavformat | |
| parent | 7c455ee86a79b54857361e2a6eaf8a23783eaf3b (diff) | |
| download | ffmpeg-a52577dae5ce0dade9ef772264ca6c442a8ea5db.tar.gz | |
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>
(cherry picked from commit 65b862ab59c4bfaae98be596b84a072f52444398)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mxfdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 539425cbbe..f70ceb8452 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -601,7 +601,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); |