aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/mxfdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2022-09-18 14:28:03 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2022-09-22 17:44:03 +0200
commit7786097825d9e3f02b4574c1924c28818eb83340 (patch)
treefd02258c28d6cde7384d8fe415b62eea50d30bbd /libavformat/mxfdec.c
parentdd81cc22b3dd5bd6badf012b4fe4c19e062650f4 (diff)
downloadffmpeg-7786097825d9e3f02b4574c1924c28818eb83340.tar.gz
avformat/mxfdec: Check run_in is within 65536
Fixes: signed integer overflow: 9223372036854775807 - -2146905566 cannot be represented in type 'long' Fixes: 50993/clusterfuzz-testcase-minimized-ffmpeg_dem_MXF_fuzzer-6570996594769920 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/mxfdec.c')
-rw-r--r--libavformat/mxfdec.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index 19cddf08d3..a33bfb0409 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -65,6 +65,7 @@
#include "mxf.h"
#define MXF_MAX_CHUNK_SIZE (32 << 20)
+#define RUN_IN_MAX (65535+1) // S377m-2004 section 5.5 and S377-1-2009 section 6.5, the +1 is to be slightly more tolerant
typedef enum {
Header,
@@ -3706,6 +3707,7 @@ static int mxf_read_header(AVFormatContext *s)
KLVPacket klv;
int64_t essence_offset = 0;
int ret;
+ int64_t run_in;
mxf->last_forward_tell = INT64_MAX;
@@ -3715,7 +3717,10 @@ static int mxf_read_header(AVFormatContext *s)
}
avio_seek(s->pb, -14, SEEK_CUR);
mxf->fc = s;
- mxf->run_in = avio_tell(s->pb);
+ run_in = avio_tell(s->pb);
+ if (run_in < 0 || run_in > RUN_IN_MAX)
+ return AVERROR_INVALIDDATA;
+ mxf->run_in = run_in;
mxf_read_random_index_pack(s);