From patchwork Wed Sep 15 20:00:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 30264 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp598704iov; Wed, 15 Sep 2021 13:02:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyK7b3lSeic6vnn/9kvCEejPv8DDJK7x3cjR/jQ19lrT8Kr9HSjRklV0YT8hZL0q9PZlcku X-Received: by 2002:a17:906:3845:: with SMTP id w5mr1924616ejc.22.1631736142653; Wed, 15 Sep 2021 13:02:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631736142; cv=none; d=google.com; s=arc-20160816; b=jpQMsqd6GO72O3WixXN1RacJ+YvgKWQpG4wJooapBwMz/XwPIoRTuxJ6lxKuvS25/U iM/wSNeAzQ+tCRgcn8AJJhuyjBMJgTsbo1H3HU6GJKmfghlDJR3PFz8IvcCzwAsHnIcx wxUzTLHRrGqMAUnNMCgVy+TGmj9anLyq2D/qY/tObGIJkb1A5lUjX9gkpzt1pGyoIz7G mt7l41LiGYZgNnfY8BqZTsNTGburKkSrFRUxsxjt8Is2x1azPA5Ux73wv5sMJTjt+AIA sxQ6HFzaq3YTybQjLrhbaAv6DQcOa7puflxqghTtJ7nZwLRfOifNsmbn4kyETKQqID6P hTTw== 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=jvWJ7p9WZaJREhuM17CusYFhZD3EHa1GLzMUoO+q6kc=; b=QipvZoZYD9GlW9qxL3fqyIP5nEMe2JD3qcNs/LZ4e2zvlpHn5MPdd3JHJwGWJ1C8ue ooZDAXECFroqeKTffOxYOSVWI+Hi+gyFXwR1DjmDcngTwAkL+8lamNAyBtxG3mhuwUr/ JQAoYYxB3UtSt2Mpgf77VkfBsIfb7IMljRoGjDSM6W3hUv3mixXaHA4nFEBZ+hyh5Y3X gHk+sDaAqdBO0nMkLQGR+36gkQu/XnE37+RRAaukBqZvKZBIplHsgJ5S9+1pIBjei/jn ngjyeZQwqPnWG4WgBUxtEoM1KRsDnYrmTkOdp0rD8opn5gIFd+ffR45/6AgfoED3AS0T PDFA== 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 h5si965496ejo.265.2021.09.15.13.02.20; Wed, 15 Sep 2021 13:02:22 -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 063CC68B00F; Wed, 15 Sep 2021 23:01:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-2.mx.upcmail.net (vie01a-dmta-pe05-2.mx.upcmail.net [84.116.36.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F379668AFE9 for ; Wed, 15 Sep 2021 23:01:49 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1mQb6L-008Bd4-0J for ffmpeg-devel@ffmpeg.org; Wed, 15 Sep 2021 22:01:49 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id Qb5NmAUWtljeHQb5NmYO6J; Wed, 15 Sep 2021 22:00:49 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=_yEADIHsjO0q-FVGkVUA:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 15 Sep 2021 22:00:47 +0200 Message-Id: <20210915200048.6691-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210915200048.6691-1-michael@niedermayer.cc> References: <20210915200048.6691-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfKPLyJ3+E4Ww5DeeAZZWJbmfzhDE1EZ/JZovN7RpmjIq129sunZyu4jJA9dRNFFdbst7kqftehVNwf95+JvtedfE6BzuLyoKpHomM09wRaSq9kQB40AC jYMmzmd7Stzj86G7pTps+ox2tREUBOefI0Aw44xuVmlAJF1odSkiDci6 Subject: [FFmpeg-devel] [PATCH 4/5] avcodec/apedec: Fix integer overflow in intermediate 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: TK52HSxyGq14 Fixes: signed integer overflow: 559334865 * 4 cannot be represented in type 'int' Fixes: 37929/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-6751932295806976 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 bf481ba3549..23318be0613 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -1337,7 +1337,7 @@ static void do_apply_filter(APEContext *ctx, int version, APEFilter *f, absres = FFABSU(res); if (absres) *f->adaptcoeffs = APESIGN(res) * - (8 << ((absres > f->avg * 3) + (absres > f->avg * 4 / 3))); + (8 << ((absres > f->avg * 3) + (absres > f->avg * 4LL / 3))); /* equivalent to the following code if (absres <= f->avg * 4 / 3) *f->adaptcoeffs = APESIGN(res) * 8;