[FFmpeg-cvslog] avformat/mxfdec: Check first case of offset_temp computation for overflow
Michael Niedermayer
git at videolan.org
Mon Apr 15 01:48:56 EEST 2024
ffmpeg | branch: release/2.8 | Michael Niedermayer <michael at niedermayer.cc> | Fri Mar 29 03:35:18 2024 +0100| [9ac32ef7f26e175209301e6ec05f3c196a800172] | committer: Michael Niedermayer
avformat/mxfdec: Check first case of offset_temp computation for overflow
This is kind of ugly
Fixes: signed integer overflow: 255 * 1157565362826411919 cannot be represented in type 'long'
Fixes: 67313/clusterfuzz-testcase-minimized-ffmpeg_dem_MXF_fuzzer-6250434245230592
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit d6ed6f6e8dffcf777c336869f56002da588e2de8)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ac32ef7f26e175209301e6ec05f3c196a800172
---
libavformat/mxfdec.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index df941dcd69..e25d2fefe8 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -1305,9 +1305,13 @@ static int mxf_edit_unit_absolute_offset(MXFContext *mxf, MXFIndexTable *index_t
if (edit_unit < s->index_start_position + s->index_duration) {
int64_t index = edit_unit - s->index_start_position;
- if (s->edit_unit_byte_count)
+ if (s->edit_unit_byte_count) {
+ if (index > INT64_MAX / s->edit_unit_byte_count ||
+ s->edit_unit_byte_count * index > INT64_MAX - offset_temp)
+ return AVERROR_INVALIDDATA;
+
offset_temp += s->edit_unit_byte_count * index;
- else if (s->nb_index_entries) {
+ } else if (s->nb_index_entries) {
if (s->nb_index_entries == 2 * s->index_duration + 1)
index *= 2; /* Avid index */
More information about the ffmpeg-cvslog
mailing list