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

riff: Validate bitrate

Browse Source
This commit is contained in:
Andreas Cadhalpun
2015-07-11 18:40:31 +02:00
committed by Luca Barbato
parent c1d647b15a
commit f1bdc23437
1 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libavformat/riffdec.c
View File

@@ -79,6 +79,7 @@ int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb,
AVCodecContext *codec, int size) AVCodecContext *codec, int size)
{ {
int id; int id;
uint64_t bitrate;
if (size < 14) if (size < 14)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@@ -87,7 +88,7 @@ int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb,
codec->codec_type = AVMEDIA_TYPE_AUDIO; codec->codec_type = AVMEDIA_TYPE_AUDIO;
codec->channels = avio_rl16(pb); codec->channels = avio_rl16(pb);
codec->sample_rate = avio_rl32(pb); codec->sample_rate = avio_rl32(pb);
codec->bit_rate = avio_rl32(pb) * 8; bitrate = avio_rl32(pb) * 8;
codec->block_align = avio_rl16(pb); codec->block_align = avio_rl16(pb);
if (size == 14) { /* We're dealing with plain vanilla WAVEFORMAT */ if (size == 14) { /* We're dealing with plain vanilla WAVEFORMAT */
codec->bits_per_coded_sample = 8; codec->bits_per_coded_sample = 8;
@@ -124,6 +125,23 @@ int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb,
if (size > 0) if (size > 0)
avio_skip(pb, size); avio_skip(pb, size);
} }
if (bitrate > INT_MAX) {
if (s->error_recognition & AV_EF_EXPLODE) {
av_log(s, AV_LOG_ERROR,
"The bitrate %"PRIu64" is too large.\n",
bitrate);
return AVERROR_INVALIDDATA;
} else {
av_log(s, AV_LOG_WARNING,
"The bitrate %"PRIu64" is too large, resetting to 0.",
bitrate);
codec->bit_rate = 0;
}
} else {
codec->bit_rate = bitrate;
}
if (codec->sample_rate <= 0) { if (codec->sample_rate <= 0) {
av_log(s, AV_LOG_ERROR, av_log(s, AV_LOG_ERROR,
"Invalid sample rate: %d\n", codec->sample_rate); "Invalid sample rate: %d\n", codec->sample_rate);