From patchwork Sat Sep 21 11:29:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 15204 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 72472445CB7 for ; Sat, 21 Sep 2019 14:30:02 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5230E68A1B4; Sat, 21 Sep 2019 14:30:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AB72268815B for ; Sat, 21 Sep 2019 14:29:55 +0300 (EEST) Received: by mail-pf1-f176.google.com with SMTP id y5so6266825pfo.4 for ; Sat, 21 Sep 2019 04:29:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=eM38SDWzk9jS7aE/vX0QKLuxTnde8/gfJDKF45Wafls=; b=U5fhktGsvgXMBjNEa06YEStIa6Dbr0UEIIGXN3OGHhFhB0Vzz6PFmtsSRKSsX7dr6A imhMco2z8jFgPRE3nvvTYEvonfCTbANfWDeXumWNDlInCwUGZnBYQ1TSFnTlyMQf1nT0 De4RsM8wF4mlU/HoqK+iWPpT+3vV0YOm6p3UfwTxOIxGMpaHR34iAQPsf59mTT8FpqOA 3VlBZOqUvIcqxalGvjCTPYmyEhKBNl2Ln51nAiTaoKQWX79JxroCjqyepA0PQDaalaEc /8y1LPGVbCg+rdpbJLViJdDdGrNxmZnKuMDmeT96bo7X+vouwMQ/r+YouBE+EcizZhv8 VBEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=eM38SDWzk9jS7aE/vX0QKLuxTnde8/gfJDKF45Wafls=; b=BTaLoXIp9XQmDi/k8Ipnz16nafoDTQbhgGqs2knpiDjSdf5e8HG5MEuXUaYHrN0rv+ BPZMWD5lwPT5Hd2HDLWQlKWLWM74YRFicR6bz53BeOOBuLdDusMjWiXG1A7JgrAbG5ah OExHXet0K2bkPxxvgQGYMyCZT3XNKbYGF/WuJKFuHfGi4NE7vtMhu9G6RFLW32ggL4i8 EyJT67A0qzC4jv5+LrOb6lU1+yqty6/e4WCqgX8XuE7msr8Rk07BU1ntlP+1YvJnbu8H ON/YyAsrUiL2+G96XGIEGfyGd1CWm835UZWtuFboS1nmLWUuUepsAw0EkKoeYrXHdTVj P0Dg== X-Gm-Message-State: APjAAAXjbeSKP/UqV3V7nYJS7QEKSXciRckZAN4NueFUkBC2cWY/9CzM cJVhNkMKuCSNTsUwq1nnIl1qbWGX X-Google-Smtp-Source: APXvYqw4I8O78jgQFglXboDK0zr3yxdtt3IGUi+CoVlzo5Z6qswCyHpS5o3v90IcEFw22eAsGyhtDA== X-Received: by 2002:a63:1d1b:: with SMTP id d27mr19667821pgd.217.1569065393107; Sat, 21 Sep 2019 04:29:53 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id z14sm4758279pgj.22.2019.09.21.04.29.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Sep 2019 04:29:52 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sat, 21 Sep 2019 19:29:47 +0800 Message-Id: <1569065387-17877-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 Subject: [FFmpeg-devel] [PATCH V1] lavc/mpeg4audio: add chan_config check to avoid indeterminate channels X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao add chan_config check to avoid indeterminate channels. Signed-off-by: Jun Zhao --- libavcodec/mpeg4audio.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/libavcodec/mpeg4audio.c b/libavcodec/mpeg4audio.c index 2197147..0ada239 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(NULL, AV_LOG_ERROR, "Invalid chan_config %d\n", c->chan_config); + return -1; + } c->sbr = -1; c->ps = -1; if (c->object_type == AOT_SBR || (c->object_type == AOT_PS &&