From patchwork Sun Oct 22 00:35:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 44303 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1b28:b0:15d:8365:d4b8 with SMTP id ch40csp662697pzb; Sat, 21 Oct 2023 17:35:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE6OtF1go1wcx6XQuyy4tJfs07zK3Qc9asFQFXFXMYro3Nd/WGmmhgwukSohSoV70nZaa/j X-Received: by 2002:ac2:5e9c:0:b0:507:8f1b:ff59 with SMTP id b28-20020ac25e9c000000b005078f1bff59mr3596800lfq.62.1697934952450; Sat, 21 Oct 2023 17:35:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697934952; cv=none; d=google.com; s=arc-20160816; b=UPed+do7/uu8Ve7DNlkmPKJFD9hSnSoJ1eX+WFsH8ex6xZzicOfprgCd3XqV+8eDcp z1mkje98I0xX06l7onEwvTEo1cF7cC54vNJhyCqIoEXyYxwVdjwPvEiUIt4EfxFsOUi5 n+TcxR4wWyL0Jl5YxqcPsf0DpYyu8VWDaA5kMemzvcY7ztkD2Z8jewtRofXintbML38v 898CDOM1PFy7mWcsMRPfytNlq1O/Qcfr7GADaLvZNAw7z2ss321SwesePwCJbEBxoLCz ynXQmymE3dNDKeniNL8jbElwpaptOTjDH5lD7COgTUu+BFT+ZxNjbmzBWfqjGFt9xHFW plcQ== 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:references:in-reply-to:message-id:date :to:from:delivered-to; bh=8wvOho7jMJxhYtOjmEP8Z7AmbHFTloKP7qqkWzW07wc=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=Q3HI9S4TVq34CmUXD9CowNWo07MMJ7s+wC78cqp+S5g9SvJOjL0PoUhpKiKgbr9a38 SZH0QDz7meb1s4csVGag/wdJid6emCR0b1aDi5v4koJL9DR5nHNTAF8J0dl6UY+8Nz5R s9t55V9leXxPAlpSNAsHpYuXSkkJxRkhGG+mU5Hehlj6TAKhsDwtmDQyMcdpBnPj2Dt2 EoQKuLNpvjX+rGKL+SmRi5MZta1hYxIgSS+/VEmIsL4SngAldgj+M0emzPI0ZpGiqBRW UAEd+rDp9l+jGSO+0k7z49QNL5Xt5zoueNtj8d1BLvf+MDubDnSxE2W60RtF8lwKgl7g XjQg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i27-20020a50d75b000000b0053dff759c2bsi1990327edj.543.2023.10.21.17.35.51; Sat, 21 Oct 2023 17:35:52 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BFA5468CA61; Sun, 22 Oct 2023 03:35:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D1FFB68CA46 for ; Sun, 22 Oct 2023 03:35:23 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 0E44F1C0002 for ; Sun, 22 Oct 2023 00:35:22 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 22 Oct 2023 02:35:17 +0200 Message-Id: <20231022003520.17154-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231022003520.17154-1-michael@niedermayer.cc> References: <20231022003520.17154-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 3/6] avcodec/apedec: Fix integer overflow in predictor_decode_stereo_3950() 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: H+yqZc9Zo0+A Fixes: signed integer overflow: 1900031961 + 553590817 cannot be represented in type 'int' Fixes: 63061/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-5166188298371072 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/apedec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c index 8bfbb75b41e..d31c0671520 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -1284,7 +1284,7 @@ static void predictor_decode_stereo_3950(APEContext *ctx, int count) *decoded1++ = a1; if (num_passes > 1) { int32_t left = a1 - (unsigned)(a0 / 2); - int32_t right = left + a0; + int32_t right = left + (unsigned)a0; if (FFMAX(FFABS(left), FFABS(right)) > (1<<23)) { ctx->interim_mode = !interim_mode;