diff mbox series

[FFmpeg-devel,1/6] avformat/mov: Check that is_still_picture_avif has no trak based streams

Message ID 20231022003520.17154-1-michael@niedermayer.cc
State Accepted
Commit 98c2711b58ce65eae02cb2ece3a664e1119fd8fe
Headers show
Series [FFmpeg-devel,1/6] avformat/mov: Check that is_still_picture_avif has no trak based streams | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Michael Niedermayer Oct. 22, 2023, 12:35 a.m. UTC
Fixes: Assertion failure in mov_read_iloc( in mov_read_iloc())
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@niedermayer.cc>
---
 libavformat/mov.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Michael Niedermayer Oct. 31, 2023, 10:13 p.m. UTC | #1
On Sun, Oct 22, 2023 at 02:35:15AM +0200, Michael Niedermayer wrote:
> Fixes: Assertion failure in mov_read_iloc( in mov_read_iloc())
> 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@niedermayer.cc>
> ---
>  libavformat/mov.c | 4 ++++
>  1 file changed, 4 insertions(+)

will apply patches of this set that have received no comment

[...]
diff mbox series

Patch

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 2f29487beb8..e8efccf6ebf 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -4628,6 +4628,10 @@  static int mov_read_trak(MOVContext *c, AVIOContext *pb, MOVAtom atom)
     MOVStreamContext *sc;
     int ret;
 
+    if (c->is_still_picture_avif) {
+        return AVERROR_INVALIDDATA;
+    }
+
     st = avformat_new_stream(c->fc, NULL);
     if (!st) return AVERROR(ENOMEM);
     st->id = -1;