aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-09-05 00:16:29 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-09-08 18:37:21 +0200
commitd08abbd0bd165f528fb97bd02c71e551d9f763ff (patch)
tree0417fa0219e3f08542a5d2adbcaed45860635d48
parentfd4500df5c87cba6f1cae97ec3cd0932e7a5eac7 (diff)
downloadffmpeg-d08abbd0bd165f528fb97bd02c71e551d9f763ff.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.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index cff3c7017f..6768aa2792 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -4702,6 +4702,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);