[FFmpeg-cvslog] avformat/mov: Check size of STSC allocation
Fredrik Hubinette
git at videolan.org
Sat Dec 2 01:49:50 EET 2017
ffmpeg | branch: release/3.0 | Fredrik Hubinette <hubbe at google.com> | Wed Nov 15 17:24:30 2017 -0800| [74677deaca819c4a25b01488e0b69d9e984f103f] | 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=74677deaca819c4a25b01488e0b69d9e984f103f
---
libavformat/mov.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 6768aa2792..85bf2e5211 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2248,6 +2248,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[%i].stsc.entries = %i\n", c->fc->nb_streams-1, entries);
More information about the ffmpeg-cvslog
mailing list