| From afc9c683ed9db01edb357bc8c19edad4282b3a97 Mon Sep 17 00:00:00 2001 |
| From: Michael Niedermayer <michael@niedermayer.cc> |
| Date: Tue, 5 Sep 2017 00:16:29 +0200 |
| Subject: [PATCH] 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@niedermayer.cc> |
| |
| CVE: CVE-2017-14223 |
| Upstream-Status: Backport |
| |
| Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
| --- |
| libavformat/asfdec_f.c | 5 +++++ |
| 1 file changed, 5 insertions(+) |
| |
| diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c |
| index f3acbae..cc648b9 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); |
| -- |
| 2.1.0 |
| |