MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

caf: fix 'pakt' chunk parsing

Browse Source 
according to the CAF specification:
"... the value for mChunkSize can be greater than the actual valid content
of the packet table chunk"
This commit is contained in:
Justin Ruggles 2012-07-09 14:10:52 -04:00
parent b0b77b9ca5
commit f5a9c35f88
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/cafdec.c
View File

@ -192,10 +192,11 @@ static int read_pakt_chunk(AVFormatContext *s, int64_t size)
st->duration += caf->frames_per_packet ? caf->frames_per_packet : ff_mp4_read_descr_len(pb);
}
if (avio_tell(pb) - ccount != size) {
if (avio_tell(pb) - ccount > size) {
av_log(s, AV_LOG_ERROR, "error reading packet table\n");
return -1;
return AVERROR_INVALIDDATA;
}
avio_skip(pb, ccount + size - avio_tell(pb));
caf->num_bytes = pos;
return 0;