aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author孙浩 and 张洪亮(望初) <tony.sh and wangchu.zhl@alibaba-inc.com>2017-08-25 01:15:27 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-09-17 12:21:32 +0200
commit98e177c7288574b336d80618f4ec5d1f94243070 (patch)
treefdcf6c01587262bc55aba4aa15f41216f1178bc6
parentf94517934bf0ff2510f472fa2bc4cd362951109c (diff)
downloadffmpeg-98e177c7288574b336d80618f4ec5d1f94243070.tar.gz
avformat/cinedec: Fix DoS due to lack of eof check
Fixes: loop.cine Found-by: Xiaohei and Wangchu from Alibaba Security Team Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 7e80b63ecd259d69d383623e75b318bf2bd491f6) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/cinedec.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/libavformat/cinedec.c b/libavformat/cinedec.c
index 32cccf566b..c615d4fc49 100644
--- a/libavformat/cinedec.c
+++ b/libavformat/cinedec.c
@@ -267,8 +267,12 @@ static int cine_read_header(AVFormatContext *avctx)
/* parse image offsets */
avio_seek(pb, offImageOffsets, SEEK_SET);
- for (i = 0; i < st->duration; i++)
+ for (i = 0; i < st->duration; i++) {
+ if (avio_feof(pb))
+ return AVERROR_INVALIDDATA;
+
av_add_index_entry(st, avio_rl64(pb), i, 0, 0, AVINDEX_KEYFRAME);
+ }
return 0;
}