mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'f1bdc234370401c032cd85184e93c7c155eb6d62'
* commit 'f1bdc234370401c032cd85184e93c7c155eb6d62':
riff: Validate bitrate
Conflicts:
libavformat/riffdec.c
See: 189420cb56
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
commit
cd32637741
|
@ -87,6 +87,7 @@ int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb,
|
||||||
AVCodecContext *codec, int size, int big_endian)
|
AVCodecContext *codec, int size, int big_endian)
|
||||||
{
|
{
|
||||||
int id;
|
int id;
|
||||||
|
uint64_t bitrate;
|
||||||
|
|
||||||
if (size < 14) {
|
if (size < 14) {
|
||||||
avpriv_request_sample(codec, "wav header size < 14");
|
avpriv_request_sample(codec, "wav header size < 14");
|
||||||
|
@ -98,23 +99,15 @@ int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb,
|
||||||
id = avio_rl16(pb);
|
id = avio_rl16(pb);
|
||||||
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);
|
||||||
} else {
|
} else {
|
||||||
id = avio_rb16(pb);
|
id = avio_rb16(pb);
|
||||||
codec->channels = avio_rb16(pb);
|
codec->channels = avio_rb16(pb);
|
||||||
codec->sample_rate = avio_rb32(pb);
|
codec->sample_rate = avio_rb32(pb);
|
||||||
codec->bit_rate = avio_rb32(pb) * 8;
|
bitrate = avio_rb32(pb) * 8;
|
||||||
codec->block_align = avio_rb16(pb);
|
codec->block_align = avio_rb16(pb);
|
||||||
}
|
}
|
||||||
if (codec->bit_rate < 0) {
|
|
||||||
av_log(s, AV_LOG_WARNING,
|
|
||||||
"Invalid bit rate: %d\n", codec->bit_rate);
|
|
||||||
if (s->error_recognition & AV_EF_EXPLODE)
|
|
||||||
return AVERROR_INVALIDDATA;
|
|
||||||
else
|
|
||||||
codec->bit_rate = 0;
|
|
||||||
}
|
|
||||||
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;
|
||||||
} else {
|
} else {
|
||||||
|
@ -155,6 +148,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);
|
||||||
|
|
Loading…
Reference in New Issue