aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorJun Zhao <barryjzhao@tencent.com>2019-09-21 19:29:47 +0800
committerJames Almer <jamrial@gmail.com>2019-09-27 10:50:18 -0300
commit333109f46961946d3c6fab05210a8d543697c91b (patch)
tree178f7e7be0890f712b9ed4d528c93a1994ec7b2c /libavcodec
parent75c7484fcb18dce4a9c00733dfcd8611877adbf6 (diff)
downloadffmpeg-333109f46961946d3c6fab05210a8d543697c91b.tar.gz
lavc/mpeg4audio: add chan_config check to avoid indeterminate channels
add chan_config check to avoid indeterminate channels. Signed-off-by: Jun Zhao <barryjzhao@tencent.com> Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/mpeg4audio.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/mpeg4audio.c b/libavcodec/mpeg4audio.c
index 6962a42537..e4d6716f7f 100644
--- a/libavcodec/mpeg4audio.c
+++ b/libavcodec/mpeg4audio.c
@@ -93,6 +93,10 @@ int ff_mpeg4audio_get_config_gb(MPEG4AudioConfig *c, GetBitContext *gb,
c->chan_config = get_bits(gb, 4);
if (c->chan_config < FF_ARRAY_ELEMS(ff_mpeg4audio_channels))
c->channels = ff_mpeg4audio_channels[c->chan_config];
+ else {
+ av_log(logctx, AV_LOG_ERROR, "Invalid chan_config %d\n", c->chan_config);
+ return AVERROR_INVALIDDATA;
+ }
c->sbr = -1;
c->ps = -1;
if (c->object_type == AOT_SBR || (c->object_type == AOT_PS &&