From patchwork Thu Jun 24 20:57:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 28611 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2042:0:0:0:0 with SMTP id z2csp823204iod; Thu, 24 Jun 2021 13:58:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyB/yuSFgbmws0LUL6Q0s+R0/HyaBPltUgS48omEJbbPMeD6KNcnLlwLmYC4HquTZv4YA7I X-Received: by 2002:a05:6402:2ce:: with SMTP id b14mr9858811edx.23.1624568317531; Thu, 24 Jun 2021 13:58:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624568317; cv=none; d=google.com; s=arc-20160816; b=ldnzT1sh3b5Mmo5NHJn7s5GAKZzHAndQxROfGUb5V/ljNEuz+XNXf3X3qjDJeMUoLX +0N5iHF7T7uCmWUF0lli5DuosbeasPm1BnW/LibSEvmkLB1B/lH3KsH53ZIeUkyIhxcx UT9PQ+lZ/vKOyVKJraRYqs4KL75BGeq3IFOKW/eXjpCKOHU03Up8afvfluWBIJHTHey2 XwtCRqtqBarhJ5PWAxM09lnOfXVKr/fA1jTZMKGnM0loMAKOKFIF7X83DSxmNVBlr+qq JXL52jRwKVVtAqPpJZvnQfSkw0YuVS1UYbIpzGDoOMg+UfrS7mg7n3Qq4FhGs2k8YBSe 6gww== 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=XzdHQDpFkzAKNxTQrMGow4ibLi3qPblKSpbJYaLWTto=; b=ylbW0W3Hced4+RN7fszpAjsxE1N58JV2j6cS3kzEB6aVBpSR7ejZmzN46ryT0/5rSi 1qinncAU0o/tn5ZiiYQXPqbVUFN4tBbt3ZPwk5oPfX4sByOMBysKXrukuyMMjQs6f7eM z23BViTBfQjP2/B4zO+b21FoQ3Xe7gUVGY9gUg5klnyrTsgM217MG0IaX/HONl3aijVG otVuYwmWIuWBqpIZO+6At0phzVsz09kjhcZGwRuZGKWas4LMFfEL7UZKKDeoypNzluzn xPSUxiL2rB9bcuLyLAbrQ7KGnRQ25FG/NhEHsmN5jNDjsHXvHQ8oPObLtDDCoJ+kFtkt Lyxg== 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 bm24si3676236ejb.577.2021.06.24.13.58.36; Thu, 24 Jun 2021 13:58:37 -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 B1D9D689CB4; Thu, 24 Jun 2021 23:58:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-1.mx.upcmail.net (vie01a-dmta-pe05-1.mx.upcmail.net [84.116.36.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DA5EB680968 for ; Thu, 24 Jun 2021 23:58:25 +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 1lwWQb-00AYzX-0M for ffmpeg-devel@ffmpeg.org; Thu, 24 Jun 2021 22:58:25 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id wWPdljwIQljeHwWPdlKH6S; Thu, 24 Jun 2021 22:57:25 +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=V0WZ6kAYpv2MOW3VQV4A:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 24 Jun 2021 22:57:24 +0200 Message-Id: <20210624205724.18711-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210624205724.18711-1-michael@niedermayer.cc> References: <20210624205724.18711-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfHBDzQJnTWjw2CF5s+ovATNUXP79eOS/HJLbVxX4yZ/czCCqE5AlSytXfQCZzH2F1Ss5Q+HZ7HY4lIE2gfuQMND72cpJcHDpvtuAMKf7MNQ1RmV024cm 2sHggDNM9YAFOv7V240TT+JdFNfX3Dwx+FBtHiEOfCSyFq1vhTsM7qOo Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/utils: Use 64bit for intermediate in AV_CODEC_ID_ADPCM_THP* duration calculation 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: O6XNJdj/pWqq Fixes: signed integer overflow: 486539264 * 14 cannot be represented in type 'int' Fixes: 35281/clusterfuzz-testcase-minimized-ffmpeg_dem_RSD_fuzzer-6068262742917120 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 342709353f..88e88bc958 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -712,7 +712,7 @@ static int get_audio_frame_duration(enum AVCodecID id, int sr, int ch, int ba, case AV_CODEC_ID_ADPCM_THP: case AV_CODEC_ID_ADPCM_THP_LE: if (extradata) - return frame_bytes * 14 / (8 * ch); + return frame_bytes * 14LL / (8 * ch); break; case AV_CODEC_ID_ADPCM_XA: return (frame_bytes / 128) * 224 / ch;