From patchwork Fri May 28 20:15:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27976 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp853928iof; Fri, 28 May 2021 13:17:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJym1f2Q01avVqNYypDqkAHvUQSVUSHp1HAXVrl7WQEuF58vwM2ASg73scbAYmq9GBUs3sij X-Received: by 2002:aa7:d70e:: with SMTP id t14mr11734133edq.377.1622233022752; Fri, 28 May 2021 13:17:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622233022; cv=none; d=google.com; s=arc-20160816; b=Qolub3j5kVqgr54MRzvIqpPwThkGzv8KNohmR3AC3yfc6HFWdnI2+ihWUhGXLX7R74 ZKajova2jboSwrdDixY6YQsaWUs8UcSZi2JMF1N6AcWzPGfnckSdKb8eE/s1qK240mdK rzfH+otCOXgrgNf0lNysuzaCURpm1gBJaZYeyF0tE0uvqS6krUHZUj+58FqKJl5zEnun Q4PRbKRYpe4oOzQtx4HZqV6mQ6QOZy1a+i+7JoociaeqDqyC9ohfUtht8/i555cYr4ot Ie8+2250lH23OC8krusc7xzRxWOXT2jn33CX5haPCUQmd+/jexmmZQNJ09nGhgnUgLsa T8NQ== 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:message-id:date:to:from:delivered-to; bh=6RoZ5f4AQGrmNdIQmgPBkMLD7QDr/H4DE2Js5nbOfmQ=; b=urW9fRzOyEIJRkMB3XeYcYV63lrMZl0C5kzVVoiH5KzJ+s24E/EmUYNqmOx7RvOpqC fT+sp1DL80Bx2urs1p7IFP2HHuyJmUhuwrJWTmrpjXjdzijvQloULqmdm0tHY4nrSV+E au5FG7rJH7k82Hrq35m9Pg1/Qf70DOido14RGdMGg+R7wL4+uRB8aHMOPG8yq8DO6kPS NaYrsbsn7XL14XbsiU93CGNgEBcquM7+ya+TbGbym3O6J5ICuyNxFej6nv98DCv1QbFg YWd0DzipMU+xEvaZzDeQ4IMlbhZ4pXa54yuBIaH0ZR8wzAjvsskUF/4lBHfmDaDZWhfG 68yA== 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 ov19si5547164ejb.437.2021.05.28.13.17.01; Fri, 28 May 2021 13:17:02 -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 8CAC4680B68; Fri, 28 May 2021 23:16:58 +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 DC832680911 for ; Fri, 28 May 2021 23:16:52 +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 1lmiua-003Gkz-04 for ffmpeg-devel@ffmpeg.org; Fri, 28 May 2021 22:16:52 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id mitclw0zGljeHmitclGfoa; Fri, 28 May 2021 22:15:52 +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=tCYTMk-PnAHFF4DzPzQA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 28 May 2021 22:15:51 +0200 Message-Id: <20210528201551.16703-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfORzKJD3un4o5qgk7mFk8LBpnNHLwij/yntnZsFIQCImUt8c3JpkRjpBzCG2y8UadlS1RvSk4pO66FtZj0HyaPQZNrkvdiemphPDFIQ2ZaPZ8cgDFvzo tHcluGgL/j7rhQ5uwdt82YNdvOrcX2hYCmMmgz9/xB6K6wd5Nd/DR3Q6 Subject: [FFmpeg-devel] [PATCH] avcodec/aacenc: Avoid 0 lambda 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: Bo7QHcASv/hz Fixes: Ticket8003 Fixes: CVE-2020-20453 Signed-off-by: Michael Niedermayer --- libavcodec/aacenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index aa223cf25f..e80591ba86 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -28,6 +28,7 @@ * TODOs: * add sane pulse detection ***********************************/ +#include #include "libavutil/libm.h" #include "libavutil/float_dsp.h" @@ -852,7 +853,7 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, /* Not so fast though */ ratio = sqrtf(ratio); } - s->lambda = FFMIN(s->lambda * ratio, 65536.f); + s->lambda = av_clipf(s->lambda * ratio, FLT_MIN, 65536.f); /* Keep iterating if we must reduce and lambda is in the sky */ if (ratio > 0.9f && ratio < 1.1f) {