virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

wavdec: check size before reading the data, not after.

Browse Source
This commit is contained in:
Anton Khirnov
2012-10-16 10:37:29 +02:00
parent 79922d7237
commit a43283b6f4
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/wavdec.c
View File

@@ -204,7 +204,7 @@ static int wav_read_header(AVFormatContext *s)
int64_t size, av_uninit(data_size); int64_t size, av_uninit(data_size);
int64_t sample_count=0; int64_t sample_count=0;
int rf64; int rf64;
uint32_t tag, list_type; uint32_t tag;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
AVStream *st = NULL; AVStream *st = NULL;
WAVDemuxContext *wav = s->priv_data; WAVDemuxContext *wav = s->priv_data;
@@ -287,12 +287,11 @@ static int wav_read_header(AVFormatContext *s)
return ret; return ret;
break; break;
case MKTAG('L', 'I', 'S', 'T'): case MKTAG('L', 'I', 'S', 'T'):
list_type = avio_rl32(pb);
if (size < 4) { if (size < 4) {
av_log(s, AV_LOG_ERROR, "too short LIST"); av_log(s, AV_LOG_ERROR, "too short LIST");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
switch (list_type) { switch (avio_rl32(pb)) {
case MKTAG('I', 'N', 'F', 'O'): case MKTAG('I', 'N', 'F', 'O'):
if ((ret = ff_read_riff_info(s, size - 4)) < 0) if ((ret = ff_read_riff_info(s, size - 4)) < 0)
return ret; return ret;