From patchwork Fri Jan 14 14:28:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33594 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp386044iog; Fri, 14 Jan 2022 06:29:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJxqj0toNL3T3VDXIX0/d5OfFVLkejLYGYLX5rDXhAL7NUcmW5AmLghib9clrsnkitvjcIxp X-Received: by 2002:a17:907:3da3:: with SMTP id he35mr7779227ejc.195.1642170566878; Fri, 14 Jan 2022 06:29:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642170566; cv=none; d=google.com; s=arc-20160816; b=cI7KfCLI9o1/i64B2DC2X0ckepn42LUrsk4H6maU53bRU6teN1GHuOY1PIX33R5gkG WMKl0NCvGqjjwaPrDZxODC30x9LPuOHCASfrUpbFUqZhg9AP9vgpFBRjp01GZPRn4SqJ vCRrPO+0StRfWDrM2yBOXd5M27PYsUmVXw3bawQGZ8vEFrn+q0RRa7e+u8TNvmStEORQ 3mHQguFQlUV+2X7cuGmQM8xh2CXmKATNv/yYaYgxP+pHnvgg9QU54qFKEcADMgdwl0Rn 3UoAZWWeUP8dpJuDukC+MC9SaGQ7Sfr5g+8B3R4tiEd3q3ABIBgtLikOz4kBqmH4rkGm nylQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=GYg9OL0yMS59w7N/PpnGvaaapvW6swsULFG3mMHaMA0=; b=Pgb34vttnSqJC63UkckNOmsi05xZ+dqDlCC0dWIQLEW1awEtrW8M1vbS8dArBPE85r mpvHLpEsT1I298zvyzZU0rgvGTRMCiktip5krKdayfz9+UzZmlQ4sY0QKrgb6JPKFCfU 2JlaiE+9G4KBGl7PHL3UMVeUaV/GVd6zs8Z8J5giUDVcvEcK5Z8aODfmBOKh7Ea6MBXU JQYJhG03IizCiDkZ3IcL3kQcpCK4zbn3dqbOUQ+FWjjL1NOnZ5YJP/VB3jD9J0UHupWP 7A9UL6QwSvV4i/N5+tivY36Sp3mH7Ql12ZIitXUz+YgHE+gmJDXdkq0ScfkMOvEedsZP c4TQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=BTLFa4F4; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id du11si3853801ejc.69.2022.01.14.06.29.25; Fri, 14 Jan 2022 06:29:26 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=BTLFa4F4; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8402268B4DB; Fri, 14 Jan 2022 16:29:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f169.google.com (mail-oi1-f169.google.com [209.85.167.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1378968B410 for ; Fri, 14 Jan 2022 16:29:16 +0200 (EET) Received: by mail-oi1-f169.google.com with SMTP id r138so12400133oie.3 for ; Fri, 14 Jan 2022 06:29:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=a6i/tNw8XEe7P1pb2z7mv6XYyWcuE89WtBn3riWPKho=; b=BTLFa4F4k+yEiGckPqwvC+1klK1CVrDHcWcm0dSUS11xTA5LyUwpKzATAWwtxNb/FW C/FuZ8HbXOCfV2MEo5mGNf7PV8qXpFI/qUlwRyKYjnltDN8D1L2aXdjldtom0yR/WO8p myv5olzUg8SHW4eBNTuB03Flk+zAr6T0DI5mE7kJMK8TlWmikIi20JkUr0zWJ5W6eRaI 9J23yGlPOnaDgZVIyAmAQAxQZD4H3Xc8hvu8uvW5hsvHJtuS0HWV7FstjfztvB1xKjks fXjZdarB4AHLSZayULPdsUBREftOJkr7lthduJFkY9wNM65Y1zWStDo8iy5akH9+Us7B lzww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=a6i/tNw8XEe7P1pb2z7mv6XYyWcuE89WtBn3riWPKho=; b=pneqmLJtPiK4Uj6KowmkgpDYf8mkNCuhUOt+hv4LHTzC3WZ7dsnKhZCLb35DjVihq1 vs8IpnNx7aJw+BKJZt7vTK/EUOuxNrjrDT4vh4aSmgaBE+7yxbACqmfCYcsjf/r7Lb7z Y/bkjtORAvSlDfh84kUPGooCpz6MuNVRPkE4V3OItzEtoQZRCKFNtsSF/T8dWUPKtLNn sDvXcQeZt6cFlTyKSif2sa7yokL4sEiWldZNjD7mkm1KKgSQ31JhQbq0tbhrpDFywqzT 0026cJ7+eEq6yGw9KEXCSaCQFUwqw5jyMIJOEjpI/0PuJVHwuBzSiIDnkHakGtxc+dGG jqrQ== X-Gm-Message-State: AOAM531EikKNI07+PnY1gmKTgBMoYYkf9dN1absf2tMjYswnpKT3+SkX K474emv1NBJXWRgOh0qNvHWDyqRnNkE= X-Received: by 2002:aca:acd3:: with SMTP id v202mr6779383oie.18.1642170554256; Fri, 14 Jan 2022 06:29:14 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id a2sm1880059oon.37.2022.01.14.06.29.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jan 2022 06:29:13 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 Jan 2022 11:28:34 -0300 Message-Id: <20220114142834.3375-1-jamrial@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/libmp3lame: check channel count after the lame_init_params() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: HtmWhnuSs2n1 LAME will silently change the channel count value if you pass it an unsupported one. This should normally not be an issue as we ensure only 1 and 2 channel streams are ever initialized, but since LAME could make changes outside our control anytime, add an extra check for this. Signed-off-by: James Almer --- A crash can be triggered if you remove the AVCodec.channel_layouts array, in which case non-mono and non-stereo streams will be initialized, but LAME will try to encode them as if they were stereo. I decided to not make this an assert() since, like i said above and even if unlikely to happen, LAME could make changes and suddenly the list of valid layouts we defined is no longer correct. libavcodec/libmp3lame.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libavcodec/libmp3lame.c b/libavcodec/libmp3lame.c index 5675864bb2..93d2ef348a 100644 --- a/libavcodec/libmp3lame.c +++ b/libavcodec/libmp3lame.c @@ -142,6 +142,15 @@ static av_cold int mp3lame_encode_init(AVCodecContext *avctx) goto error; } + /* LAME does not error out on unsupported channel values and silently + * changes it to a supported one. Look for this and abort. + */ + if (lame_get_num_channels(s->gfp) != avctx->channels) { + av_log(avctx, AV_LOG_ERROR, "Incosistent channel count\n"); + ret = AVERROR_EXTERNAL; + goto error; + } + /* get encoder delay */ avctx->initial_padding = lame_get_encoder_delay(s->gfp) + 528 + 1; ff_af_queue_init(avctx, &s->afq);