[FFmpeg-cvslog] avformat/mov: Check size of STSC allocation

Fredrik Hubinette git at videolan.org
Sat Dec 30 23:58:58 EET 2017


ffmpeg | branch: release/3.3 | Fredrik Hubinette <hubbe at google.com> | Wed Nov 15 17:24:30 2017 -0800| [74104d2dc05d903a2b94e3457fc1a2cf8fe224a2] | committer: Michael Niedermayer

avformat/mov: Check size of STSC allocation

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit a6fdd75fe6440d2f4150cb456a9078aa68b00fdb)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

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

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 90b068f091..6ebdf8a4b7 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2411,6 +2411,8 @@ static int mov_read_stsc(MOVContext *c, AVIOContext *pb, MOVAtom atom)
     avio_rb24(pb); /* flags */
 
     entries = avio_rb32(pb);
+    if ((uint64_t)entries * 12 + 4 > atom.size)
+        return AVERROR_INVALIDDATA;
 
     av_log(c->fc, AV_LOG_TRACE, "track[%u].stsc.entries = %u\n", c->fc->nb_streams - 1, entries);
 



More information about the ffmpeg-cvslog mailing list