diff options
| author | 孙浩 and 张洪亮(望初) <tony.sh and [email protected]> | 2017-08-25 01:15:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2017-09-10 01:33:28 +0200 |
| commit | 6bd562e04440c48eb79e24c36800791bbb1ba0b6 (patch) | |
| tree | 06d41fac2ceaa7bc944542c1b8c96e999db45bbe | |
| parent | 4ff1fcd3caa2e59c3d4cec8e4c64c9ac79b09a1d (diff) | |
avformat/rmdec: Fix DoS due to lack of eof check
Fixes: loop.ivr
Found-by: Xiaohei and Wangchu from Alibaba Security Team
Signed-off-by: Michael Niedermayer <[email protected]>
(cherry picked from commit 124eb202e70678539544f6268efc98131f19fa49)
Signed-off-by: Michael Niedermayer <[email protected]>
| -rw-r--r-- | libavformat/rmdec.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index 178eaea57d..d6d7d9cd84 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -1223,8 +1223,11 @@ static int ivr_read_header(AVFormatContext *s) av_log(s, AV_LOG_DEBUG, "%s = '%s'\n", key, val); } else if (type == 4) { av_log(s, AV_LOG_DEBUG, "%s = '0x", key); - for (j = 0; j < len; j++) + for (j = 0; j < len; j++) { + if (avio_feof(pb)) + return AVERROR_INVALIDDATA; av_log(s, AV_LOG_DEBUG, "%X", avio_r8(pb)); + } av_log(s, AV_LOG_DEBUG, "'\n"); } else if (len == 4 && type == 3 && !strncmp(key, "StreamCount", tlen)) { nb_streams = value = avio_rb32(pb); |