virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

iff: fix some incorrect interpretations of invalid files

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2012-11-30 10:44:00 +00:00
parent 50b5c2296a
commit 1560c3295d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/iff.c
View File

@ -167,6 +167,10 @@ static int iff_read_header(AVFormatContext *s)
avio_skip(pb, 8);
// codec_tag used by ByteRun1 decoder to distinguish progressive (PBM) and interlaced (ILBM) content
st->codec->codec_tag = avio_rl32(pb);
iff->bitmap_compression = -1;
iff->svx8_compression = -1;
iff->maud_bits = -1;
iff->maud_compression = -1;
while(!url_feof(pb)) {
uint64_t orig_pos;
@ -193,8 +197,6 @@ static int iff_read_header(AVFormatContext *s)
case ID_MHDR:
st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
iff->maud_bits = -1;
iff->maud_compression = -1;
if (data_size < 32)
return AVERROR_INVALIDDATA;
avio_skip(pb, 4);
@ -250,7 +252,6 @@ static int iff_read_header(AVFormatContext *s)
break;
case ID_BMHD:
iff->bitmap_compression = -1;
st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
if (data_size <= 8)
return AVERROR_INVALIDDATA;