diff options
| author | 孙浩 and 张洪亮(望初) <tony.sh and wangchu.zhl@alibaba-inc.com> | 2017-08-25 01:15:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-08-28 01:42:24 +0200 |
| commit | c70fdd9948085a72c8f622c6e22d9349cbf0bc75 (patch) | |
| tree | 31602a9ec29a9e70ae22b9bc4a73154fad1f573a | |
| parent | 6904464301bbfff6e21616d43d657b163359bb3d (diff) | |
| download | ffmpeg-c70fdd9948085a72c8f622c6e22d9349cbf0bc75.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.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavformat/cinedec.c b/libavformat/cinedec.c index 632f46c454..1497842cf2 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; } |