From 020d53ebdb581ea5a493239537cb0f5cc54809e9 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michael@niedermayer.cc>
Date: Sat, 3 Dec 2016 23:37:27 +0100
Subject: [PATCH] avcodec/flac: Check bps in ff_flac_parse_streaminfo()
---
libavcodec/flac.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libavcodec/flac.c b/libavcodec/flac.c
index f5154b9149d..069cde442b3 100644
--- a/libavcodec/flac.c
+++ b/libavcodec/flac.c
@@ -222,6 +222,11 @@ void ff_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *s,
s->channels = get_bits(&gb, 3) + 1;
s->bps = get_bits(&gb, 5) + 1;
+ if (s->bps < 4) {
+ av_log(avctx, AV_LOG_ERROR, "invalid bps: %d\n", s->bps);
+ s->bps = 16;
+ }
+
avctx->channels = s->channels;
avctx->sample_rate = s->samplerate;
avctx->bits_per_raw_sample = s->bps;
--
GitLab