aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-08-25 01:15:30 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-08-28 01:43:31 +0200
commit0ca5c57d9d0670097235102abd54cccfb3f3c2db (patch)
tree5729b54f2db770a9fe27495387bed9349d60817a
parent2ac9bc34978cf77eebaf288741bdfa669e1df195 (diff)
downloadffmpeg-0ca5c57d9d0670097235102abd54cccfb3f3c2db.tar.gz
avformat/mvdec: Fix DoS due to lack of eof check
Fixes: loop.mv Found-by: Xiaohei and Wangchu from Alibaba Security Team Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 4f05e2e2dc1a89f38cd9f0960a6561083d714f1e) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/mvdec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/mvdec.c b/libavformat/mvdec.c
index 186b581f89..609095286d 100644
--- a/libavformat/mvdec.c
+++ b/libavformat/mvdec.c
@@ -327,6 +327,8 @@ static int mv_read_header(AVFormatContext *avctx)
uint32_t pos = avio_rb32(pb);
uint32_t asize = avio_rb32(pb);
uint32_t vsize = avio_rb32(pb);
+ if (avio_feof(pb))
+ return AVERROR_INVALIDDATA;
avio_skip(pb, 8);
av_add_index_entry(ast, pos, timestamp, asize, 0, AVINDEX_KEYFRAME);
av_add_index_entry(vst, pos + asize, i, vsize, 0, AVINDEX_KEYFRAME);