har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/ty: check if header is correctly parsed and is still present

Browse Source 
Fixes #6829.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2017-11-12 20:26:42 +01:00
parent c31ce95f1c
commit 6665938ca8
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/ty.c
View File

@ -440,6 +440,8 @@ static int get_chunk(AVFormatContext *s)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
ty->rec_hdrs = parse_chunk_headers(ty->chunk + 4, num_recs); ty->rec_hdrs = parse_chunk_headers(ty->chunk + 4, num_recs);
if (!ty->rec_hdrs)
return AVERROR(ENOMEM);
ty->cur_chunk_pos += 16 * num_recs; ty->cur_chunk_pos += 16 * num_recs;
return 0; return 0;
@ -723,8 +725,8 @@ static int ty_read_packet(AVFormatContext *s, AVPacket *pkt)
return AVERROR_EOF; return AVERROR_EOF;
while (ret <= 0) { while (ret <= 0) {
if (ty->first_chunk || ty->cur_rec >= ty->num_recs) { if (!ty->rec_hdrs || ty->first_chunk || ty->cur_rec >= ty->num_recs) {
if (get_chunk(s) < 0 || ty->num_recs == 0) if (get_chunk(s) < 0 || ty->num_recs <= 0)
return AVERROR_EOF; return AVERROR_EOF;
} }