[FFmpeg-cvslog] avformat/mov: disallow a zero sample size in trun atoms

Marton Balint git at videolan.org
Thu Jul 7 00:38:17 EEST 2022


ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Mon Jun 27 21:52:35 2022 +0200| [03d81a044ad587ea83567f75dc36bc3d64278199] | committer: Marton Balint

avformat/mov: disallow a zero sample size in trun atoms

In order to not generate 0 sized packets or create a huge index table
needlessly.

Fixes: Timeout
Fixes: 43717/clusterfuzz-testcase-minimized-ffmpeg_IO_DEMUXER_fuzzer-5206008287330304
Fixes: 45738/clusterfuzz-testcase-minimized-ffmpeg_IO_DEMUXER_fuzzer-6142535657979904

Signed-off-by: Marton Balint <cus at passwd.hu>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=03d81a044ad587ea83567f75dc36bc3d64278199
---

 libavformat/mov.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 5d8b24368a..6eb631d45b 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -5179,6 +5179,8 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom)
         distance++;
         if (av_sat_add64(dts, sample_duration) != dts + (uint64_t)sample_duration)
             return AVERROR_INVALIDDATA;
+        if (!sample_size)
+            return AVERROR_INVALIDDATA;
         dts += sample_duration;
         offset += sample_size;
         sc->data_size += sample_size;



More information about the ffmpeg-cvslog mailing list