RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-05 22:33:37 +00:00
Code Issues Projects Releases Wiki Activity

mpeg4audio: validate sample_rate

Browse Source 
A negative sample rate doesn't make sense and triggers assertions in
av_rescale_rnd.

Also check for errors from avpriv_mpeg4audio_get_config in
ff_mp4_read_dec_config_descr.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
This commit is contained in:
Andreas Cadhalpun 2016-10-23 17:03:04 +02:00
parent 9d36602abc
commit 0747754622
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/mpeg4audio.c
View File

@ -42,6 +42,11 @@ static int parse_config_ALS(GetBitContext *gb, MPEG4AudioConfig *c)
// which are buggy in old ALS conformance files
c->sample_rate = get_bits_long(gb, 32);
if (c->sample_rate <= 0) {
av_log(NULL, AV_LOG_ERROR, "Invalid sample rate %d\n", c->sample_rate);
return AVERROR_INVALIDDATA;
}
// skip number of samples
skip_bits_long(gb, 32);

6
libavformat/isom.c
View File

@ -513,8 +513,10 @@ FF_ENABLE_DEPRECATION_WARNINGS
return ret;
if (st->codecpar->codec_id == AV_CODEC_ID_AAC) {
MPEG4AudioConfig cfg = {0};
avpriv_mpeg4audio_get_config(&cfg, st->codecpar->extradata,
st->codecpar->extradata_size * 8, 1);
ret = avpriv_mpeg4audio_get_config(&cfg, st->codecpar->extradata,
st->codecpar->extradata_size * 8, 1);
if (ret < 0)
return ret;
st->codecpar->channels = cfg.channels;
if (cfg.object_type == 29 && cfg.sampling_index < 3) // old mp3on4
st->codecpar->sample_rate = avpriv_mpa_freq_tab[cfg.sampling_index];