From patchwork Wed Apr 28 15:06:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27463 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a11:4023:0:0:0:0 with SMTP id ky35csp514962pxb; Wed, 28 Apr 2021 08:13:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxw20Cof5duP+e9jPjj/fpcC89E0K/Q+18LxaBaJaUmN9SjFZl4+V0OBJhcZGNxWI3Ujtdd X-Received: by 2002:a17:906:c218:: with SMTP id d24mr28870033ejz.363.1619622829015; Wed, 28 Apr 2021 08:13:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619622829; cv=none; d=google.com; s=arc-20160816; b=Kdhal6UwNJRIo8fLTopl62y95fbJrNXrBpcdM398cQ4XyIfo75HONGaQf77fBVONrx jH/WpHTKMY5x/Pq+StYbQlAyVS+RQfDIPQW/HWhAomUNGF6Y+0xu5Gp/QWJRYjvmqlhK dRQCTPRYKmGefvcpSPDJq3a7VGa03mL1EfPwUnxGrOjVruGiqayvLTf2+jDw2/HerbK4 YI8zJe/W/WaX90y6m2pJkFfAGTv9rpCanS2woH2h1YJl6NAJ1rRFS08Ef3u+6FwDFZdU Ed+QCjjWJFEDSYMO0YSY0cmAzHEnsASQ+rn9Lm5CH82Wy4GovQjutyFhXhZbhSw+ZAgP pr9Q== 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=8Gc7bKOoXxN33/CPI8T0rTL7M+GF505Zw8rzDI7VDhQ=; b=1JcprAg3Qb7p48pOn4Gemsm1w+ASZlzS9n//3j9Qqi6CTb7mRCnj//6vFJFj9NPK6c HqbSf6a2HUF2lF/djEa2G6XjSo7H11EcyJApi9ebbGZWNM2POOh2zZaztaSnfILfa4Yq M0wKBdQleTp1FrKzONsqXmKTJMX//HYIZ7yqip/0sU+HVfbfrFf+IHh+J1GwU6hb9YRS 9qyAseR2RiwzIza5LHxqsu4T3nTm5Te5a2jw3HEaKfke1upTGvm+Nq2Nfpt066bhZXyc rAJx8Q+nap18kjhFYykxoJ0DJkPtrS0B8Kfx21F/dyM2w84IcDHpeaIUDQktuqa7ZOTU kX3Q== 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 a3si298534ejd.575.2021.04.28.08.13.48; Wed, 28 Apr 2021 08:13:49 -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 AADE368A0DE; Wed, 28 Apr 2021 18:13:45 +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 A78C56898E4 for ; Wed, 28 Apr 2021 18:13:39 +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 1lblmr-00FMJ0-0I for ffmpeg-devel@ffmpeg.org; Wed, 28 Apr 2021 17:07:37 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id blltlck78ljeHblltlNui4; Wed, 28 Apr 2021 17:06:37 +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=cwwbtKSeleFYVBYmjEgA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=UDnyf2zBuKT2w-IlGP_r:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 28 Apr 2021 17:06:34 +0200 Message-Id: <20210428150636.28396-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210428150636.28396-1-michael@niedermayer.cc> References: <20210428150636.28396-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfCkT15dgI5d+RYQlfBR1KeVIhwGVO5a/CVN8/YA0tsNTcAmIVR9x1fhRoFGm3Znt32WvghgGJNmZbpZS3euICmyY1DJgJOeoXQaHHJIG8O2X1eFgrvrE raGiLklN6m89LHn2IBvSjlJpASHFZVvO4mmK7MTGirJyYtj2vDfO2VbB Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/utils: do "calc from frame_bytes, channels, and block_align" in 64bit 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: 5kbizdYSZCuX Fixes: signed integer overflow: 104962766 * 32 cannot be represented in type 'int' Fixes: 33614/clusterfuzz-testcase-minimized-ffmpeg_dem_RSD_fuzzer-6252129036664832 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/utils.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 9cee989098..e5e239fd98 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -733,25 +733,33 @@ static int get_audio_frame_duration(enum AVCodecID id, int sr, int ch, int ba, if (ba > 0) { /* calc from frame_bytes, channels, and block_align */ int blocks = frame_bytes / ba; - int64_t tmp; + int64_t tmp = 0; switch (id) { case AV_CODEC_ID_ADPCM_IMA_WAV: if (bps < 2 || bps > 5) return 0; tmp = blocks * (1LL + (ba - 4 * ch) / (bps * ch) * 8); - if (tmp != (int)tmp) - return 0; - return tmp; + break; case AV_CODEC_ID_ADPCM_IMA_DK3: - return blocks * (((ba - 16) * 2 / 3 * 4) / ch); + tmp = blocks * (((ba - 16LL) * 2 / 3 * 4) / ch); + break; case AV_CODEC_ID_ADPCM_IMA_DK4: - return blocks * (1 + (ba - 4 * ch) * 2 / ch); + tmp = blocks * (1 + (ba - 4LL * ch) * 2 / ch); + break; case AV_CODEC_ID_ADPCM_IMA_RAD: - return blocks * ((ba - 4 * ch) * 2 / ch); + tmp = blocks * ((ba - 4LL * ch) * 2 / ch); + break; case AV_CODEC_ID_ADPCM_MS: - return blocks * (2 + (ba - 7 * ch) * 2LL / ch); + tmp = blocks * (2 + (ba - 7LL * ch) * 2LL / ch); + break; case AV_CODEC_ID_ADPCM_MTAF: - return blocks * (ba - 16) * 2 / ch; + tmp = blocks * (ba - 16LL) * 2 / ch; + break; + } + if (tmp) { + if (tmp != (int)tmp) + return 0; + return tmp; } }