1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

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

This commit is contained in:
Anton Khirnov 2012-10-16 10:37:29 +02:00
parent 79922d7237
commit a43283b6f4

View File

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