[FFmpeg-devel] [PATCH] avformat/mov: The iloc test is not redundant
Michael Niedermayer
michael at niedermayer.cc
Sun Oct 15 03:13:23 EEST 2023
Fixes: Assertion failure
Fixes: 62866/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-5282997370486784
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
---
libavformat/mov.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 2f29487beb..34691d0cda 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -7788,11 +7788,10 @@ static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom)
return 0;
}
- if (c->avif_info) {
- av_log(c->fc, AV_LOG_INFO, "Duplicate iloc box found\n");
+ if (c->avif_info || c->fc->nb_streams) {
+ av_log(c->fc, AV_LOG_INFO, "Duplicate or invalid iloc box found\n");
return 0;
}
- av_assert0(!c->fc->nb_streams);
version = avio_r8(pb);
avio_rb24(pb); // flags.
--
2.17.1
More information about the ffmpeg-devel
mailing list