From patchwork Tue Jul 2 21:25:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 50296 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp2722286vqv; Tue, 2 Jul 2024 15:04:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWSQR0RR4d8sW44LS67whfipOUXIk7LmsXT1Gt8vMhkPjHurth+glTGlBq9jM3QuxBy2y2K29YPwoygKbdhN3YwRZashtVqLDkF9A== X-Google-Smtp-Source: AGHT+IGP1Uv7WsYAnnpD8ymln2kc1g/eBbHG8HiU4GmjDiy2UPVa40VFU8Sw0445T1nuY6MFamX9 X-Received: by 2002:a17:906:730d:b0:a75:110d:fa51 with SMTP id a640c23a62f3a-a75144a2774mr794458866b.58.1719957845662; Tue, 02 Jul 2024 15:04:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719957845; cv=none; d=google.com; s=arc-20160816; b=s6AgCFhZXJJq5pYvlw0wN15wFVj/FBAJ8YJnjRWroEFKBZEMoOnZoZ0wWWTsXC1Szg oDq/wqPw2BvgwzMlIptoproLRI2HaCnR45Ypi45h6wsuxAM0HQow+jqiASScQEGeyQs2 zH75vW5zBd4qQ/3MsYoEQgQCAmh4/FpdJ+tWGC51GLctmTF89xVlkdfX7RYRvvF4Su+y roQm0p0xrkY4s8ffkKECuA3garzNjdLrnS4mfage4w7LohC/dcG3cGdL1gkU1ju6EGc+ rEjwLGjfRM+aA3GBrCXt2uY41FDhdEO/Dfsfyf64EplucZ9OOTvl9o1EYVcwXhEw6Iuv a+ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:date:from:to:message-id:dkim-signature :delivered-to; bh=a0Z3pRYGZ6upmrS1c9HCkoCBGzrAgveQvxq0p1iFgpE=; fh=5IeVwzS1vbVKjIV8MP3mnmnRtZGb8uteQ9r4QD2keV0=; b=litaWPNbagt9zOnRtKSl5GRO4ld8qGBfNxHSMQvCX1qqCWHXjkZJuNtxoZIkh0QcK3 miP16aTlvS+uN5Dx7jn11/fkuyMhC4s1WqINnKLa+vjg2BBNzf9C5S3mFE7GAjxeHtsx lbOZfAPWCTPV1dWyHPbnnTPCcKUovgTi196ZBH3wR5HDX+YaAn5bKvWX8m01Lfk7m3a8 8kuFa4/HfiTrez4bOhXiNTpvFaekVJ4jvBinac6DrcaruBgSnPYY6FwUflk2N/D2wC/D 74zhNnAFWtTdCQaVayUjZgE7A8HpLZSKIlLwP6mpobf4ZpJE/DeUOSQYrunxQsczn3ef v3oQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=WTV7t4EW; 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 a640c23a62f3a-a72aaf242e8si479806566b.247.2024.07.02.15.04.04; Tue, 02 Jul 2024 15:04:05 -0700 (PDT) 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=20230601 header.b=WTV7t4EW; 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 33DB568D981; Wed, 3 Jul 2024 00:26:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3C98868D929 for ; Wed, 3 Jul 2024 00:26:35 +0300 (EEST) Received: by mail-ej1-f41.google.com with SMTP id a640c23a62f3a-a72b3e1c14cso549944366b.1 for ; Tue, 02 Jul 2024 14:26:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719955594; x=1720560394; darn=ffmpeg.org; h=subject:date:from:to:message-id:from:to:cc:subject:date:message-id :reply-to; bh=SNl9NRzgn83tkqsg6DVhVBFxnJgtZ+l5/gihMpDaxcg=; b=WTV7t4EWiHMjp2EB8xed8V9EBDHB157kAvOyLFEcEAfsfxd8R8lVfvEyEt91Zyb0NS JmzxLt1jrq6bankO0aiz30UNerE2nJuiQylOaaIchu68w8e5JADgLffAofsnAbeIV90W NHbvvrTJ09TXIpBjTMM4w3U6sSrOyJ7MrTAaNWghUR8pfPM1pXmiyFIwOZGIDlasEEOx cgQPQTJuDCciheDcv+AJoxHI89qr9AqX7DGpJhjwYNEbJgbS6p+V7r+DAM3hc6WcIAyy U9eaWOV7+8+ZUzOmxo8UNrfSl2uQT59XwF/zYhjcpjH4SR9o8B+FhaM9AHr9qvn0Lrpz n6MA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719955594; x=1720560394; h=subject:date:from:to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SNl9NRzgn83tkqsg6DVhVBFxnJgtZ+l5/gihMpDaxcg=; b=mAfzabzOisLKpNjScE1+1HXn+PItdCPxa0CnFcGycUFVK0qEc51n6ghQrLuE8/f4c8 wnM15HJQdWc4JuOjHWupHw+1Dsrj+WBByM0H9T7Wxufv/KGCDj56/jyyzv76wC+kRd1q PmZq5LfqNwUGTPY6fx4n6GbAIK36OI8Xhs7F00jm/n42FTRhovmTEtm2czdH0Eu3PgsZ Lu8bPw7oMbqUnMElPdQMyR8HpMZ0w8gL7UGB9oF6bcVdULC8O5ZniibCGyRBQGeiT0Al UYPa6EGEwXbBnl9TPEMVPq56/jxkxJkBlbphpNoBtNGW1aP+HBY37H7hawrxC0JRlkNu j0fQ== X-Gm-Message-State: AOJu0Yzu7OWcObSTuDlQbGMBmFLyg/8HM9IqEky3sedMpa0zj4I0ZSiv oYIZZ7V1eW1C8VWUU6hAEXNQ+3crABf3eOXPWSgKMmXYA+rDoz5U49GYDA== X-Received: by 2002:a17:907:6d26:b0:a6f:c4d6:4874 with SMTP id a640c23a62f3a-a751444c63amr639755166b.34.1719955594167; Tue, 02 Jul 2024 14:26:34 -0700 (PDT) Received: from localhost (p200300cccf0d6b0015dc1b9b6d5e601e.dip0.t-ipconnect.de. [2003:cc:cf0d:6b00:15dc:1b9b:6d5e:601e]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a72aaf5a585sm452672766b.52.2024.07.02.14.26.33 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 02 Jul 2024 14:26:33 -0700 (PDT) Message-Id: To: From: "Marvin Scholz" Date: Tue, 2 Jul 2024 23:25:57 +0200 Subject: [FFmpeg-devel] [PATCH] avcodec/aacdec_usac: Fix array size 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: p87T3owhfgHZ The array in ff_aac_usac_mdst_filt_cur that is passed to that has a size of 7 elements, not 6 and the code in the function accesses the array at index 6, which would be out of bounds if the size was actually 6. Fixes: CID1603196 --- libavcodec/aac/aacdec_usac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: e783e45e29e78616debba7f6d1fe6e54dc336496 diff --git a/libavcodec/aac/aacdec_usac.c b/libavcodec/aac/aacdec_usac.c index 4856c1786b..32b3c534bf 100644 --- a/libavcodec/aac/aacdec_usac.c +++ b/libavcodec/aac/aacdec_usac.c @@ -1134,7 +1134,7 @@ static void complex_stereo_downmix_cur(AACDecContext *ac, ChannelElement *cpe, } } -static void complex_stereo_interpolate_imag(float *im, float *re, const float f[6], +static void complex_stereo_interpolate_imag(float *im, float *re, const float f[7], int len, int factor_even, int factor_odd) { int i = 0;