[libav-devel] [PATCH 1/2] matroskadec: check audio sample rate

Andreas Cadhalpun andreas.cadhalpun at googlemail.com
Mon Jun 15 21:17:36 CEST 2015


And default to 8000 if it is invalid.

An invalid sample rate can trigger av_assert2 in av_rescale_rnd.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
---
 libavformat/matroskadec.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 3512f0f..81dd53f 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1680,6 +1680,14 @@ static int matroska_parse_tracks(AVFormatContext *s)
         if (!track->codec_id)
             continue;
 
+        if (track->audio.samplerate < 0 || track->audio.samplerate > INT_MAX ||
+            isnan(track->audio.samplerate)) {
+            av_log(matroska->ctx, AV_LOG_WARNING,
+                   "Invalid sample rate %f, defaulting to 8000 instead.\n",
+                   track->audio.samplerate);
+            track->audio.samplerate = 8000;
+        }
+
         if (track->type == MATROSKA_TRACK_TYPE_VIDEO) {
             if (!track->default_duration && track->video.frame_rate > 0)
                 track->default_duration = 1000000000 / track->video.frame_rate;
-- 
2.1.4


More information about the libav-devel mailing list