Re: [FFmpeg-devel] [PATCH 3/9] avformat/mov: Ignore duplicate CoLL

[Michael Niedermayer]

On Mon, Apr 19, 2021 at 08:23:40PM +0200, Michael Niedermayer wrote:
> Fixes: memleak
> Fixes: 
> 32146/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-5377612845285376
> 
> Found-by: continuous fuzzing process 
> https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer 
> ---
>  libavformat/mov.c | 5 +
>  1 file changed, 5 insertions(+)

will apply

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

If you fake or manipulate statistics in a paper in physics you will never
get a job again.
If you fake or manipulate statistics in a paper in medicin you will get
a job for life at the pharma industry.


signature.asc
Description: PGP signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 3/9] avformat/mov: Ignore duplicate CoLL

[Michael Niedermayer]

Fixes: memleak
Fixes: 
32146/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-5377612845285376

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 
---
 libavformat/mov.c | 5 +
 1 file changed, 5 insertions(+)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index add1e94641..3436fb6b73 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -5501,6 +5501,11 @@ static int mov_read_coll(MOVContext *c, AVIOContext *pb, 
MOVAtom atom)
 }
 avio_skip(pb, 3); /* flags */
 
+if (sc->coll){
+av_log(c->fc, AV_LOG_WARNING, "Ignoring duplicate COLL\n");
+return 0;
+}
+
 sc->coll = av_content_light_metadata_alloc(>coll_size);
 if (!sc->coll)
 return AVERROR(ENOMEM);
-- 
2.17.1

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".