From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 36AD749C09 for ; Tue, 5 Mar 2024 04:52:09 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 91D7368C91A; Tue, 5 Mar 2024 06:52:05 +0200 (EET) 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-Google-Smtp-Source: AGHT+IEqcFgU2DIHKp6/+SmviLYILz03I76G/s0aSYCA6V+f+Tox5dKTslRbPplztS3tbrvIaojURA== 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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; -- 2.39.2 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".