From patchwork Mon Jul 4 22:30:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36665 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp3097165pzh; Mon, 4 Jul 2022 15:30:56 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uZaBc/aItfcskEVJo6PYJBInFG7ocqpRoWW9Ec6Z+qAHOzqbcLSXWlwAzox7DSEmK6guhy X-Received: by 2002:a17:906:5a4e:b0:72a:605a:57c3 with SMTP id my14-20020a1709065a4e00b0072a605a57c3mr24761297ejc.301.1656973856518; Mon, 04 Jul 2022 15:30:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656973856; cv=none; d=google.com; s=arc-20160816; b=aAcNIOf+zd3I3kyUZ2QuS5TuXq+JzxmVK6fF9/jsVjwoQEgMTyq3BWrkEvGB7K1J4/ KC8ZJG7dgry3w2dyYM7ZU1KLx1TpTp+yZWlI4N5sxcWgpEZjAiC+3eRhrpyseocEVfmG NAkqriUZADgr3W0SRPkQD91S9TW++dVN13Tm5Zu0sbpd5rngTnN/e6VKuTRsvSiDXjsP NUCzsAtw5yo8gZWFhv4TUtLmhuE/O2r7b+INcNgqIH4RIbJ0bD3kxLdpFtfdFMKxoLZ8 PvQRRcTg0392u6bP9YQinGcICw8lJZcleLHoF4o3O58UZf6BrLlwjVR2Ywg8CP8F1N3m Npmg== 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=AecBssBDbur9RJLrzOH6oLW6W0V2xruDo4HKS6MPJH0=; b=fW3ZQXSmVq7sh53sVoLyvo/0NFmX8apmRN0u9+t/DAo4iwoK0VmDq3CoU5v5tDh6D0 DxXs2UkAt4FZHZzHJduefsfvoPgwNGwB/gZvx38eLlSIkwDa1lD61IhfXgbNePewg9Mv MVpAH6sayAI9YXZ0dL4Cpegsaw74I6CwyHGXyQAo0Cq0FBMMOxpH7SfNHSCHs1iJHbIE h/3eqDGcRCFlwi/bup0WDfYisDq2SR8hTKvy/+6vrEeYP2Y7j4/Iu2JnQO02l9IefHA7 M4aeTTU66kyCuNhH3OtAV4KqQIuQhhz+Tq2FS8AxpCtoUBbH0QKnWS0fwPojoFsnPw3P rPhw== 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 f20-20020a056402355400b0043774af6f0asi27482483edd.371.2022.07.04.15.30.56; Mon, 04 Jul 2022 15:30:56 -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 D77B668B931; Tue, 5 Jul 2022 01:30:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-2.mx.upcmail.net (vie01a-dmta-at03-2.mx.upcmail.net [62.179.121.152]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D9A7A68B804 for ; Tue, 5 Jul 2022 01:30:36 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1o8UaR-000MRs-QJ for ffmpeg-devel@ffmpeg.org; Tue, 05 Jul 2022 00:30:35 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 8USzowQIx8s8U8UaRonO43; Tue, 05 Jul 2022 00:30:35 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id 8UaRo9Roi8eSW8UaRor0hj; Tue, 05 Jul 2022 00:30:35 +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.4 cv=KKE5sHJo c=1 sm=1 tr=0 ts=62c36a0b a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=55yFLhZSyP6QP7fv7yAA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 5 Jul 2022 00:30:34 +0200 Message-Id: <20220704223034.15056-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220704223034.15056-1-michael@niedermayer.cc> References: <20220704223034.15056-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfJYmTzC2vBLCPStCBgEWa4f41aKWpUAmoRALARsd7WMAdmbEFvDES7vn/UMmKYNkVNhSzQDcin0IYl+TgodQN9jhMf1ihlaMukiIRxe33BxJxopYL2D1 bsgDueUrOk8jsFlMMfHpBSB98pfuBo1h2u5qXZH2uWUFYKmjnsUeK6GF4vGoJZ7QGe/lEQTHMMWxZA== Subject: [FFmpeg-devel] [PATCH 3/3] avformat/iff: simplify 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: okwPXtzN2kRs Fixes: signed integer overflow: 315680096256 * 134215943 cannot be represented in type 'long long' Fixes: 48713/clusterfuzz-testcase-minimized-ffmpeg_dem_IFF_fuzzer-5886272312311808 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/iff.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/iff.c b/libavformat/iff.c index 3c861ef34d..b37600605a 100644 --- a/libavformat/iff.c +++ b/libavformat/iff.c @@ -384,7 +384,7 @@ static int read_dst_frame(AVFormatContext *s, AVPacket *pkt) avio_skip(pb, 1); pkt->flags |= AV_PKT_FLAG_KEY; pkt->stream_index = 0; - pkt->duration = 588LL * s->streams[0]->codecpar->sample_rate / 44100; + pkt->duration = s->streams[0]->codecpar->sample_rate / 75; pkt->pos = chunk_pos; chunk_pos = avio_tell(pb); @@ -397,7 +397,8 @@ static int read_dst_frame(AVFormatContext *s, AVPacket *pkt) case ID_FRTE: if (data_size < 4) return AVERROR_INVALIDDATA; - s->streams[0]->duration = avio_rb32(pb) * 588LL * s->streams[0]->codecpar->sample_rate / 44100; + s->streams[0]->duration = avio_rb32(pb) * (uint64_t)s->streams[0]->codecpar->sample_rate / 75; + break; }