From patchwork Fri Apr 23 17:50:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27224 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp1753871iob; Fri, 23 Apr 2021 10:58:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxaGdEw/GLXI+R8BVauznp3QPOx0Zxt97LvuqrJwopyiOzZkvwFxl8Sl0mcMZmI7VOINDlx X-Received: by 2002:a17:906:93f7:: with SMTP id yl23mr4507559ejb.407.1619200680266; Fri, 23 Apr 2021 10:58:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619200680; cv=none; d=google.com; s=arc-20160816; b=msIgEI8Q3XZd5YGV3yON0hdLk7fDfy+/tH0ShIei8S4tFzavr2wvUjL2HY4KPo5z1R DCqOUjL8oMOY+EPx1MrJ+a/7J7TSu8cR7Qbz19hCAI/C9UpFxIJYYssABG3+79SyzP0E VdWjIalgy5yfaX/Mnsj1XtfW9NMyWsHYmjbMOdukHjSSGMqdUX1xUGiD/hMNba+pqlNt ZlQffaesPPBrVZcBdF3554XxpoSA27mlnUs6SiUv03rL0U7AetJQeJw+IJSFGEnMXKss 8wj2LZZfV/TYylmuR3ymHzIlyCQtOWZnjFGSfMacVztaHP6FjtkenJ4+rD1YbLYP+Et/ k9yg== 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=L1eX5Wz2+uxGnV/II9FXd9/Ra9wl4Z/rZl2DLuVT3RE=; b=YN9Unlb/QXlUN/Oma6n5d+DeyTRpdZiX+3fpQeHJVYCKUBMlPqCCOMxJ0zv0YZIkzD aYEe5Y/2QIVmHCnvzZ6fh6NJ3XM4vY2APulbCKQ1fhEfEpGv+yW0vL0Ym80LYeox8Ql4 ZYyANJ3M1WdE52s/gZfBI6XzfnJrQjHBEd6Nauu1QRo50iDs4OD1obGQTBPrcPap37hT RXGRR0N5QPMjDbcisWTFHsWd38iwA5bHsOqWFqDgKWVMqYyHt+B0QQmEaiu/m9a+XGTa OLHyeNilp7HerO1qF2Q7hboih3yGuq9UqMlno2W8+ZN8tVjr1uiYm0KneLxGVIND8Ahr s1tw== 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 j12si5408143edq.408.2021.04.23.10.57.59; Fri, 23 Apr 2021 10:58:00 -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 CEE72689EB2; Fri, 23 Apr 2021 20:57:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-3.mx.upcmail.net (vie01a-dmta-pe01-3.mx.upcmail.net [62.179.121.156]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 410D268987B for ; Fri, 23 Apr 2021 20:57:49 +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 1lZzyA-00CtFT-0M for ffmpeg-devel@ffmpeg.org; Fri, 23 Apr 2021 19:51:58 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id ZzxClGeZvljeHZzxClb2oj; Fri, 23 Apr 2021 19:50:58 +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=BgjjGP0nQ8SBBV0uqHUA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=UDnyf2zBuKT2w-IlGP_r:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 23 Apr 2021 19:50:55 +0200 Message-Id: <20210423175056.24019-6-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210423175056.24019-1-michael@niedermayer.cc> References: <20210423175056.24019-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfKykrPkteO1WGO8ux/Y/fLKqxsVEQjPhIbNsh1nScj2u8QiG1uV9DPBn8dPwQQR+c8xEnFOro6O4Z84EXDjt8rZaSkDvNG7UzKDWTGyuIMNOgJvpck8b 90OMilX+KzkpBiUlt1WRU5BYQq9mHifiWWDm8XVduO9GdPcfEUiAAFTL Subject: [FFmpeg-devel] [PATCH 6/7] avformat/dsfdec: Change order of operations in bitrate 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: XjwnbguUjjZu Fixes: signed integer overflow: 538976288 * 67372036 cannot be represented in type 'int' Fixes: 29102/clusterfuzz-testcase-minimized-ffmpeg_dem_DSF_fuzzer-6751696819716096 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/dsfdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/dsfdec.c b/libavformat/dsfdec.c index 2fca25ef32..7681c917c5 100644 --- a/libavformat/dsfdec.c +++ b/libavformat/dsfdec.c @@ -129,7 +129,7 @@ static int dsf_read_header(AVFormatContext *s) return AVERROR_INVALIDDATA; } st->codecpar->block_align *= st->codecpar->channels; - st->codecpar->bit_rate = st->codecpar->channels * st->codecpar->sample_rate * 8LL; + st->codecpar->bit_rate = st->codecpar->channels * 8LL * st->codecpar->sample_rate; avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate); avio_skip(pb, 4);