From patchwork Tue Mar 5 04:51:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean McGovern X-Patchwork-Id: 46802 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3944:b0:19e:cdac:8cce with SMTP id ac4csp182389pzc; Mon, 4 Mar 2024 20:52:10 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVokll7rgtl6NHUar1dzlLk7wUkVsIP9STIiOb7qog1vUTDlP0D2tcjCNJIsnkHG4CAZZl+0SLhhw/Fy4naDUTyFENFrLfVdv22jQ== X-Google-Smtp-Source: AGHT+IFJgKe+GKVQHAwJEcf3qzqQrKQ4s+RwOsA5blurgHKX9BJ4XUZTJkN5NZsTbXeotOUK9mG4 X-Received: by 2002:a17:907:8e98:b0:a3b:b215:6edb with SMTP id tx24-20020a1709078e9800b00a3bb2156edbmr585659ejc.6.1709614329889; Mon, 04 Mar 2024 20:52:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709614329; cv=none; d=google.com; s=arc-20160816; b=tTF8VgMJuRPtN4TkGT8ITpnW/U/Xj35aZSlIbOh6Euxm69TVe7jrmWTeEJh3Y0e7+t TOxkDFQI8SsAkXzbTpRJQ6DAaYqLVPiSqOBi47uek0OaTelZS2ZNTdVD1nGmSAJ9MaBM 7GPiwJP1Q/uot5SXoyaRwktRunpYXiCbWx54bsbVCxigu1/+8yymxTXjr0ZtV8QmwR0E pIBdxHu4Ohue+kLIT+VIt2s22zhphFgOcmEvX/3TZ5EsPH6u7dnTa7e7wxCQG2incjBM HPlndI5MSot3rs15+0RYSMWZe2UPBax6p/sg5BymbZu/VG4a2yaGpdFWux9hGvC04ZGf T+tA== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=npq0ZEWv7fPHHvNtIUePNuUmuXn/N/ZAHdAntucKdbg=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=smDzsBcOwQCcj37jbQthmiNYMWklfnwSF95k4CZg/84u0YOOg+gSQJN8BxI9ty3nKN 0noQp6Y3YhzcBM9gpUBEp2aFUynszSOW59neKNbRodTZEJ3MbFFM9hri5nNAPn4lXULb LM0sMMiMSPDHI6XbxekkMJJT5iOsDwu4fHQVxW3qb8R0JftzrExaUfmk24mf3LX0ercR DtWYe7ikiqiXxd/hsl+j8OqmG1qfkryDSREGXqaDixckoT6lkfwZIuNwldfSPj/+FQan 68KStTt8KoHMLYgIxcwGcWn9PL9BDMQZIvyi013Py5S424YOQajhQdZVsb8B38cdvnux jzSw==; 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=kjHmidNQ; 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 u14-20020a170906c40e00b00a4454ffed2dsi4346398ejz.950.2024.03.04.20.52.09; Mon, 04 Mar 2024 20:52:09 -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=20230601 header.b=kjHmidNQ; 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 CF8A568C402; Tue, 5 Mar 2024 06:52:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f51.google.com (mail-qv1-f51.google.com [209.85.219.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3423968C66E for ; Tue, 5 Mar 2024 06:51:59 +0200 (EET) Received: by mail-qv1-f51.google.com with SMTP id 6a1803df08f44-6869233d472so26721516d6.2 for ; Mon, 04 Mar 2024 20:51:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709614316; x=1710219116; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=U/jaa+cCqGisjxv6aR6GzgQDwjZ2MOWs+sh9qgExgTs=; b=kjHmidNQGcmXERB/7PBO9lX8ycf8r5m5Rll3DDj3n9B8Ou7cocDUjg4IpuUAUB8DC7 kw3nopfc846C21vM1xvePpHf7l1DOMgP106U50UxY9NhHwRlhMU1mR8mhkTA4T3fEutn CQ4bI9f0QAzohBJA1cQGZb7irBKmyjfmjfXK2VW/tGgNIVMuTeN+qfe/kV9OhpZ7CMcP 5qNJXT+4pc209TFwqJhzEPn6T9hdIiL4NTQxl0a7c1FdKdcpkzRx9IZI7MmxomD2rIU+ Gbvr6cN9QRQ/yYqi2P5e0xkq0R9zKRen5BmMuz50EctPeStNCbCgZC7fXa+W8nPnxZiH kfRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709614316; x=1710219116; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=U/jaa+cCqGisjxv6aR6GzgQDwjZ2MOWs+sh9qgExgTs=; b=j9tZiUbMvaKZNG3cfzRecslufeyeGcoY27lQHMOjncoSQzhbxqmUOdFge2U4CcZfAQ iK0nOcqtHC7Y4w/YEd4Vyl3UQEvI5MBFcO5z4U3jhMsJT8Y7srnT/qOv1147S2sgyPIX bzUdAqD9m+sNnq5sohKlHXdORV00FVgUwrS6b7ri7EeDhVXeVO/yZhvTYZFPOp7xRsXh ajzbrkj6r+5W+yHpPyHEURdeXDgPU9Z95n1NXgoXDqKMhMdnpzNOYXK4PbtLARPem1HX H2X8Z7mo35Z6U2EgAXlRPrpTm29FtxC0pNybeVUU9gqR+11SEO50zkbrZNUsZLButvhn HPTg== X-Gm-Message-State: AOJu0YxTIVujq6ss+IhNA6CpNUnpeP0/JiuS8BqZnHLUYGDyNEovgs6X 2aQ5aKg2054yOLJU4MLZ0IXqinITpprcZLAdAYIu9RF+nJS+vo6SZcjEHNyf X-Received: by 2002:a0c:f28b:0:b0:68f:2b9a:75ec with SMTP id k11-20020a0cf28b000000b0068f2b9a75ecmr1095335qvl.61.1709614316369; Mon, 04 Mar 2024 20:51:56 -0800 (PST) Received: from elysia.seanmcgovern.ca ([2607:f2c0:9205:5200:ca08:a01f:24be:88a7]) by smtp.gmail.com with ESMTPSA id e11-20020a0ce3cb000000b0068f2d774000sm5849455qvl.73.2024.03.04.20.51.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 20:51:55 -0800 (PST) From: Sean McGovern To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Mar 2024 23:51:49 -0500 Message-Id: <20240305045149.199832-1-gseanmcg@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240225184429.2962707-2-gseanmcg@gmail.com> References: <20240225184429.2962707-2-gseanmcg@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] aacenc_pred: prevent UB in ff_aac_adjust_common_pred() 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: K80RbGlYWNPz Iterate over 'pmax' instead of 'num_swb'. --- libavcodec/aacenc_pred.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/aacenc_pred.c b/libavcodec/aacenc_pred.c index a486c44d42..c5b8aa9665 100644 --- a/libavcodec/aacenc_pred.c +++ b/libavcodec/aacenc_pred.c @@ -164,7 +164,7 @@ void ff_aac_adjust_common_pred(AACEncContext *s, ChannelElement *cpe) for (w = 0; w < sce0->ics.num_windows; w += sce0->ics.group_len[w]) { start = 0; - for (g = 0; g < sce0->ics.num_swb; g++) { + for (g = 0; g < pmax; g++) { int sfb = w*16+g; int sum = sce0->ics.prediction_used[sfb] + sce1->ics.prediction_used[sfb]; float ener0 = 0.0f, ener1 = 0.0f, ener01 = 0.0f;