diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-18 02:20:54 +0200 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2013-09-18 15:07:49 -0300 |
| commit | dbb534cea6b2b135485fd04cea022d08a350ac37 (patch) | |
| tree | 188a5acc054a2ef0d953743e4f39e2d4af512ab5 | |
| parent | 414d75b8bc06ac97cc78de318689b9a1c2074399 (diff) | |
| download | ffmpeg-dbb534cea6b2b135485fd04cea022d08a350ac37.tar.gz | |
avformat/matroskadec: check out_samplerate before using it in av_rescale()
Prevent assertion failure with damaged input
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 338f8b2eaf36f078eb5cc26ac10e651dc4c48243)
| -rw-r--r-- | libavformat/matroskadec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index d72c4ef7f8..b686eeba75 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1737,6 +1737,8 @@ static int matroska_read_header(AVFormatContext *s) avio_wl16(&b, 1); avio_wl16(&b, track->audio.channels); avio_wl16(&b, track->audio.bitdepth); + if (track->audio.out_samplerate < 0 || track->audio.out_samplerate > INT_MAX) + return AVERROR_INVALIDDATA; avio_wl32(&b, track->audio.out_samplerate); avio_wl32(&b, av_rescale((matroska->duration * matroska->time_scale), track->audio.out_samplerate, AV_TIME_BASE * 1000)); } else if (codec_id == AV_CODEC_ID_RV10 || codec_id == AV_CODEC_ID_RV20 || |