RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/nsvdec: Fix DoS due to lack of eof check in nsvs_file_offset loop. 

Fixes: 20170829.nsv

Co-Author: 张洪亮(望初)" <wangchu.zhl@alibaba-inc.com>
Found-by: Xiaohei and Wangchu from Alibaba Security Team
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
孙浩(晓黑) 2017-08-29 23:59:21 +02:00 committed by Michael Niedermayer
parent 73bed07373
commit c24bcb5536
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/nsvdec.c
View File

@ -335,8 +335,11 @@ static int nsv_parse_NSVf_header(AVFormatContext *s)
if (!nsv->nsvs_file_offset) if (!nsv->nsvs_file_offset)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
for(i=0;i<table_entries_used;i++) for(i=0;i<table_entries_used;i++) {
if (avio_feof(pb))
return AVERROR_INVALIDDATA;
nsv->nsvs_file_offset[i] = avio_rl32(pb) + size; nsv->nsvs_file_offset[i] = avio_rl32(pb) + size;
}
if(table_entries > table_entries_used && if(table_entries > table_entries_used &&
avio_rl32(pb) == MKTAG('T','O','C','2')) { avio_rl32(pb) == MKTAG('T','O','C','2')) {