[FFmpeg-cvslog] avformat/asfdec: Fix DoS in asf_build_simple_index()
Michael Niedermayer
git at videolan.org
Sun Sep 17 14:00:06 EEST 2017
ffmpeg | branch: release/3.2 | Michael Niedermayer <michael at niedermayer.cc> | Tue Sep 5 00:16:29 2017 +0200| [4e4177dde23be77a97887f409f237e17ef53f329] | committer: Michael Niedermayer
avformat/asfdec: Fix DoS in asf_build_simple_index()
Fixes: Missing EOF check in loop
No testcase
Found-by: Xiaohei and Wangchu from Alibaba Security Team
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit afc9c683ed9db01edb357bc8c19edad4282b3a97)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4e4177dde23be77a97887f409f237e17ef53f329
---
libavformat/asfdec_f.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c
index 2cacafe50d..d9dfbf0fa3 100644
--- a/libavformat/asfdec_f.c
+++ b/libavformat/asfdec_f.c
@@ -1610,6 +1610,11 @@ static int asf_build_simple_index(AVFormatContext *s, int stream_index)
int64_t pos = s->internal->data_offset + s->packet_size * (int64_t)pktnum;
int64_t index_pts = FFMAX(av_rescale(itime, i, 10000) - asf->hdr.preroll, 0);
+ if (avio_feof(s->pb)) {
+ ret = AVERROR_INVALIDDATA;
+ goto end;
+ }
+
if (pos != last_pos) {
av_log(s, AV_LOG_DEBUG, "pktnum:%d, pktct:%d pts: %"PRId64"\n",
pktnum, pktct, index_pts);
More information about the ffmpeg-cvslog
mailing list