From patchwork Sat Apr 24 15:59: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: 27253 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp2202370yba; Sat, 24 Apr 2021 09:00:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9c+PGY6EGjaW0CwCtkSrGJ2g+HH2Yg/HxjiYb8ZzUlKpdDayhTq88vJ3RNLfS9r80wBHs X-Received: by 2002:a17:906:6a93:: with SMTP id p19mr9762284ejr.319.1619280046364; Sat, 24 Apr 2021 09:00:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619280046; cv=none; d=google.com; s=arc-20160816; b=gaZZmV0Ce7cuXW9KNfa/BjBUaRyunWJuxrqYo0CZWCMbyNUoHVVdLZVZW/uDyM/8Kp Gwdedg2BVnOb2ogCR+LuBjG7Kkr6l7EyYAARsNf8Hsjd332hsPpLsUS/86SmgVUs1AMZ uRshqp9zs0jMmdaIGpldcRuDA1xSZ530f1kEfqyCFZfF/P5Pgy8dCIZLz/PxfY2yWLrK nr/oB+UP5/ByFYcDWU0U0PsOoLzV5obAYHdX7Z4diZ9rb3LlKynBdAuidOy/bbM54Ypc 42+uhCslxxrukn5nGLh+PupRTOd/JUzZW9cSR3008+9LGC6nsd1NEgJ1yRhYMwxoeHem GPRw== 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=BLaRLkpSq8ijyZ7yJ3jgYxZUYaIpBrSQXqFhjZ4GssM=; b=FFnpuVYfGANQIxGyrtUBt8xfVFTzPeXVRwZnQAeHligH7TBMaPgzL2YLh7++RQXbzV K/Ey/rP/eyuDrrzU8p6/wccyOqDQ4cesgIj2me23BUkgP0qyfG6H95Et8ZHnEQu4DAE+ zDm64eaDUGt3d98FFp0IdVDNF1PufrKJO/Iwi2IK1+kk5N68m50oEzg7lnYYotTG2s3b NhT/h452e9cDyVa8xFIXYleVRw32+QdYmp9WJCfVU0DigFeyO+caib7B2QS7q9L/ADzM VdG+CN0FqeLzOAIS3KoNNGrsoI7Ha2HSJjky+A+TZTryEYN5DqyVa9A4DOi7MTaMOj+V fVpg== 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 f5si7664268edw.108.2021.04.24.09.00.46; Sat, 24 Apr 2021 09:00:46 -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 582BE680BFE; Sat, 24 Apr 2021 19:00:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-1.mx.upcmail.net (vie01a-dmta-pe01-1.mx.upcmail.net [62.179.121.154]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 37A0A680A7F for ; Sat, 24 Apr 2021 19:00:27 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1laKhn-00GTW2-0R for ffmpeg-devel@ffmpeg.org; Sat, 24 Apr 2021 18:00:27 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id aKgolhTQHljeHaKgpljNBt; Sat, 24 Apr 2021 17:59:27 +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=WGDL60ZxXam1uetKiJ0A:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=SsAZrZ5W_gNWK9tOzrEV:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 24 Apr 2021 17:59:24 +0200 Message-Id: <20210424155926.4018-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210424155926.4018-1-michael@niedermayer.cc> References: <20210424155926.4018-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfPZ3Z1/d1B1RjEyEHujd6P/DZT81a7mZRRLm8iPdr/XjDAcFwJPxAhqMct/di+mLV6hpy1Kt74DthEXZ49p/e0LU5kM2DFWFiIl4/iaQ47N9Cwp0LBVg UC0gzUhKxq1r8rzOvOl3kqgdNGtHNn8W0xz1OjJl+RbbJHgv+zW5gwD8 Subject: [FFmpeg-devel] [PATCH 2/4] avformat/iff: Use 64bit in duration computation 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: SD+aHh4linyc Content-Length: 1240 Fixes: signed integer overflow: 588 * 16719904 cannot be represented in type 'int' Fixes: 29102/clusterfuzz-testcase-minimized-ffmpeg_dem_IFF_fuzzer-6748331936186368 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/iff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/iff.c b/libavformat/iff.c index 27b5581cc3..bc4c410ebe 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 = 588 * s->streams[0]->codecpar->sample_rate / 44100; + pkt->duration = 588LL * s->streams[0]->codecpar->sample_rate / 44100; pkt->pos = chunk_pos; chunk_pos = avio_tell(pb);