From patchwork Sun Apr 28 21:30:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 48341 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1509:b0:1a9:af23:56c1 with SMTP id nq9csp1641894pzb; Sun, 28 Apr 2024 14:31:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWGcsrwZA0t9P9QXwtrJnE5XRFN+7l0c1O0dWGhm/AnGqF5d7RhJaMoEE+swDekZ/FItNU5qjMS/PeOzBxwNI5EKwD4QpY9m5hH+g== X-Google-Smtp-Source: AGHT+IFuDP2SFbUf/x4JFqSZMpSurHZ5p1m+LIOk19rGexzmONSPeUjEkTmpoggVDDYnLnl5EJCU X-Received: by 2002:a5d:53c8:0:b0:34c:9a04:4673 with SMTP id a8-20020a5d53c8000000b0034c9a044673mr2765581wrw.4.1714339875369; Sun, 28 Apr 2024 14:31:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714339875; cv=none; d=google.com; s=arc-20160816; b=HWaCEs4gWTa9tjZWCYrBbRYrwgIVWn0aXgoWGzDBRp7OgBwpFg+VlwVgFgJB1uhU+w So17gtyMWqGyY52G25yKSKXsr37IGSZ69+WQnPeAjmgmc19Pi6JZRDClo19xRu/17X3a NW+Fz0YxzVkTMCjfkXhjzS5Qe94uLLKlX05gRTCIBWdeaLGEwIQbnHyHQUOOIX9aj7xm jkldTeE9n17HIMz5HshzzZspy0ue8LRuDiqdeadrhqybGNidkFHFG3vxyebLl5+Cavre yxwVoOlOjh3QCgeg2dGSVmBdfHHXrbA30k22rC8ndEqBcPEAGc+odQD4XIWSUcaPqiGo tm+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=DOToYDslIt6L+cSrCMqQ+s6nFm3tVuPzo+z34HGTvXU=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=ogrhDsPYLm8CWlnFdx4uDWpMLry3cKp50f+tMzWtGUYRwpAouJ4GmZAAYsbBVZsOaF +6hcIZCCKvDIiQmoXzBbdR1TnEcrbrzzYpqndb0dYTlpMtgtSg2ITnVMF5nkgrBtpWyj srheUqrFLUGuDadnvEcfuhxxyTx873LxW8VkIjkGFo0y11YVObeKOdhx6KDushWQrXib G/uJ91JUhkNVLjujze7tHrmsEZmH10lBT45z9nxv9N/35bzg/zvdqgaTi/oKQqB4a0/d PrOLuVPtz1d9Y6inNyqva3ePJL4h28e9/26i9yD2BfSeLvU+Z3UBc+kZKnAZBg+i5dr0 JA7A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=A18LsvkA; 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 r15-20020a17090638cf00b00a55b063a282si9677611ejd.243.2024.04.28.14.31.15; Sun, 28 Apr 2024 14:31:15 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=A18LsvkA; 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 2FB1C68D404; Mon, 29 Apr 2024 00:31:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4A26068D3E4 for ; Mon, 29 Apr 2024 00:30:55 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 93888C0006 for ; Sun, 28 Apr 2024 21:30:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1714339854; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=agRXQzJUotCv/NiUmDl2wa0lty4elzS75CdWVP9XSDc=; b=A18LsvkApSfLz1rjzxtAOM0QolOAXIOmlLtobD5wL8J8WZpXkpdVdnlX4tzaMgwft02YAV DJT2PCaNpFzUrELYLbLurmc6eLc3joG73g+IdsSmRuTwtF20FvitXVNAyuJWi7tn01dhnN hxcPfjczNcT0GYLbNlqZaytPfn16SXluWMmFM2XUul9flI60qQoEaEHuFpeg4kpxudC4GQ 2S9EmP7ZaPbrda1V1hQS01qSNb949lg8d4U0iXYJRiTxx0VbL9ztNn27UHR3f9IY2+lPiJ IQj49GBDiiSIzef+7fmPlzWgUZ6Y2Bg3thw5XkOuhAFbLYWtjqF2LH1gUK48rQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 28 Apr 2024 23:30:49 +0200 Message-ID: <20240428213052.3800493-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240428213052.3800493-1-michael@niedermayer.cc> References: <20240428213052.3800493-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/aaccoder: assert that escape case len is not causing issues 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 9keYXFV4SPk+ Inspired by CID1465483 Unintentional integer overflow Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/aaccoder.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/aaccoder.c b/libavcodec/aaccoder.c index 4ce54ca8867..6e5817e237b 100644 --- a/libavcodec/aaccoder.c +++ b/libavcodec/aaccoder.c @@ -178,6 +178,8 @@ static av_always_inline float quantize_and_encode_band_cost_template( int coef = av_clip_uintp2(quant(fabsf(in[i+j]), Q, ROUNDING), 13); int len = av_log2(coef); + av_assert2(len >= 4); + put_bits(pb, len - 4 + 1, (1 << (len - 4 + 1)) - 2); put_sbits(pb, len, coef); }