diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2017-09-05 00:16:29 +0200 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-09-17 12:21:32 +0200 |
commit | c9527df274ada02a19c2f973b29d1d5b7069d4bf (patch) | |
tree | 2343a36d97a87acb7199b05729f201f9be68d9a8 | |
parent | 372bb594385f97c31981e5ab5bf4c6cd56959102 (diff) | |
download | ffmpeg-c9527df274ada02a19c2f973b29d1d5b7069d4bf.tar.gz |
avformat/mov: Fix DoS in read_tfra()
Fixes: Missing EOF check in loop
No testcase
Found-by: Xiaohei and Wangchu from Alibaba Security Team
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 9cb4eb772839c5e1de2855d126bf74ff16d13382)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r-- | libavformat/mov.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 405476fd71..b97aa001a3 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -5394,6 +5394,13 @@ static int read_tfra(MOVContext *mov, AVIOContext *f) } for (i = 0; i < index->item_count; i++) { int64_t time, offset; + + if (avio_feof(f)) { + index->item_count = 0; + av_freep(&index->items); + return AVERROR_INVALIDDATA; + } + if (version == 1) { time = avio_rb64(f); offset = avio_rb64(f); |