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

cafdec: fix parsing of chunks which may have unused data

Browse Source 
Specification mentions 'strg', 'mark', 'regn', 'info', .. chunks
to have data section size larger than chunk's current meaningful
content in order to reserve room for additional data.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2012-10-26 14:01:51 +00:00
parent 3d6a246b4b
commit c2e2b3029e
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/cafdec.c
View File

@ -225,7 +225,7 @@ static int read_header(AVFormatContext *s)
AVStream *st;
uint32_t tag = 0;
int found_data, ret;
int64_t size;
int64_t size, pos;
avio_skip(pb, 8); /* magic, version, file flags */
@ -254,6 +254,7 @@ static int read_header(AVFormatContext *s)
tag = avio_rb32(pb);
size = avio_rb64(pb);
pos = avio_tell(pb);
if (url_feof(pb))
break;
@ -296,9 +297,14 @@ static int read_header(AVFormatContext *s)
case MKBETAG('f','r','e','e'):
if (size < 0)
return AVERROR_INVALIDDATA;
avio_skip(pb, size);
break;
}
if (size > 0) {
if (pos + size < pos)
return AVERROR_INVALIDDATA;
avio_skip(pb, FFMAX(0, pos + size - avio_tell(pb)));
}
}
if (!found_data)