aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFredrik Hubinette <hubbe@google.com>2017-11-15 17:24:30 -0800
committerMichael Niedermayer <michael@niedermayer.cc>2018-01-31 22:56:14 +0100
commitc11ac27f49f799231999515c0a417ad27eb38be5 (patch)
treeb6a199ba2356b36df50647740ada45d08b81aceb
parent0af4a5b180d4fb5c67d3b1d7be2a1d2027691b37 (diff)
downloadffmpeg-c11ac27f49f799231999515c0a417ad27eb38be5.tar.gz
avformat/mov: Check size of STSC allocation
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit a6fdd75fe6440d2f4150cb456a9078aa68b00fdb) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/mov.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 0ff3c1cd48..4d4c1a4df9 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2206,6 +2206,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);