[FFmpeg-cvslog] adxdec: validate sample_rate
Andreas Cadhalpun
git at videolan.org
Mon Nov 7 01:54:00 EET 2016
ffmpeg | branch: master | Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com> | Sun Oct 23 15:47:40 2016 +0200| [2eb05eaa682ec49eade91e358ace4e1415695686] | committer: Andreas Cadhalpun
adxdec: validate sample_rate
A negative sample rate doesn't make sense and triggers assertions in
av_rescale_rnd.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2eb05eaa682ec49eade91e358ace4e1415695686
---
libavformat/adxdec.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libavformat/adxdec.c b/libavformat/adxdec.c
index cf44531..0315ecb 100644
--- a/libavformat/adxdec.c
+++ b/libavformat/adxdec.c
@@ -109,6 +109,11 @@ static int adx_read_header(AVFormatContext *s)
return AVERROR_INVALIDDATA;
}
+ if (par->sample_rate <= 0) {
+ av_log(s, AV_LOG_ERROR, "Invalid sample rate %d\n", par->sample_rate);
+ return AVERROR_INVALIDDATA;
+ }
+
par->codec_type = AVMEDIA_TYPE_AUDIO;
par->codec_id = s->iformat->raw_codec_id;
par->bit_rate = par->sample_rate * par->channels * BLOCK_SIZE * 8LL / BLOCK_SAMPLES;
More information about the ffmpeg-cvslog
mailing list