From patchwork Fri May 28 18:48:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27974 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp801654iof; Fri, 28 May 2021 11:55:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy8iAaQ5sISCdzr8wy3RcIUse/TbpggYLFWHTGigyHQXsRLx1tw9rngP6PK0v2JX/pwd4+/ X-Received: by 2002:a17:907:72d5:: with SMTP id du21mr8314153ejc.375.1622228155675; Fri, 28 May 2021 11:55:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622228155; cv=none; d=google.com; s=arc-20160816; b=VH5OrpnZsi9wm5B2USGL408mX8S8qLKQ1NrchwGsUjxeGPWtSWOs66VNGNkZzkfpi2 pFGQoAN0WbcLzKnl3RCMH1cAJlsxbv5pUbg6vPCmwGm8RrrRZiITGYKHEXj10LUJH4EB gTWpq/OXfgY+SJojlEUAJF/I7NezB/SOnz9Aq+HYLkukNaf9qu1gNc1Y+VVL1BdyJlfB MJ8QXpMGvZOcaaowffrfQn1PaxxtlFsN1uMnE2j9x6xn0aibCTBAPijMswO3KYUrg/lw zKnpMZDthrnVxU9K9OvgyIaza9flnblCtzJ+dqH80DzAD8M9dT7y0Cr5YyOaZTpdRU+e jNvA== 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=jj0WWW6gyWQBojYbUt0SEK0XtlAJ+lcTZ5VwP+TE0WI=; b=X8VgGZzQfm0Ug7SnM5o6+tMfwtG+k0LpmcHhfSXoARBGR1NZ0tPzokt9qowHiyQI83 N9dWPPgMIvgbBviP1VzkDZtzHRTRKXYHJXziMG35vWW+mRqpnlzSOaGA7n0F/t3oXPs0 PlUn50lKfAUqLoaBv1VN5LfMOJprr5mS6pNquZN0LvoSm6U3N5KqB5kb5Ki/JG170if/ q4EbQJOZkCPjja5SXyxaU2C5twSbWuLVWWqruJQFJQaazLu9i7vTbOZ+C4Uu4heqEuvS TBWYJn7UvbPHmpIyNZ4ZpzgeDuQPdDiuW4lK/RyaYddNkcNM6WY9MwYCHlRwxSt7OlJ/ NyLw== 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 bl4si6731081ejb.689.2021.05.28.11.55.55; Fri, 28 May 2021 11:55:55 -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 2CFB968007F; Fri, 28 May 2021 21:55:53 +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 40DD0680825 for ; Fri, 28 May 2021 21:55:47 +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 1lmhY6-00DEDl-0A for ffmpeg-devel@ffmpeg.org; Fri, 28 May 2021 20:49:34 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id mhX8lu3IRljeHmhX8lG58f; Fri, 28 May 2021 20:48:34 +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=fvyHzEfAHHX3tYi8PksA:9 a=pHzHmUro8NiASowvMSCR:22 a=Ew2E2A-JSTLzCXPT_086:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 28 May 2021 20:48:33 +0200 Message-Id: <20210528184834.4625-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210528184834.4625-1-michael@niedermayer.cc> References: <20210528184834.4625-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfObS33MfqG/b3i3t+K5zYvuYNK7i9O78riDpUcCtmgmQ5HujqFEXAJj396Mi4bwtgLaXAinN4DVjD7T6m8zbFLFioG+Nd91PKdEEzr61zxzELMSjASd1 /isV3hm9H100qOFNT8ZejzhBCkGfpul9KBBR1DDCaNo1qEZMPmk8Suov Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/aacpsy: Avoid floating point division by 0 of norm_fac 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: oGZOgRQV1GJY Fixes: Ticket7995 Fixes: CVE-2020-20446 Signed-off-by: Michael Niedermayer --- libavcodec/aacpsy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/aacpsy.c b/libavcodec/aacpsy.c index 482113d427..e51d29750b 100644 --- a/libavcodec/aacpsy.c +++ b/libavcodec/aacpsy.c @@ -794,7 +794,7 @@ static void psy_3gpp_analyze_channel(FFPsyContext *ctx, int channel, if (pe < 1.15f * desired_pe) { /* 6.6.1.3.6 "Final threshold modification by linearization" */ - norm_fac = 1.0f / norm_fac; + norm_fac = norm_fac ? 1.0f / norm_fac : 0; for (w = 0; w < wi->num_windows*16; w += 16) { for (g = 0; g < num_bands; g++) { AacPsyBand *band = &pch->band[w+g];