From patchwork Fri Jul 5 00:21:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50349 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp4003623vqv; Thu, 4 Jul 2024 17:34:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU2H8yEtF2pdIJ7ji5zBCSC27blfMtSaJ/vbuS+EilNelQ06+Afisac1YxK07FLWnYrJjAW5HjtecWVS1uSMW9qz0+v6rpdd8jevA== X-Google-Smtp-Source: AGHT+IEtVvkYojBDYTXhFK+ivfZscbuqA0HaZhBLgm4yVJGZJAPoboZAjLCzP1rYOTu2IXY+DTxJ X-Received: by 2002:a2e:8681:0:b0:2ee:7d3c:670 with SMTP id 38308e7fff4ca-2ee8ed42c87mr21180491fa.19.1720139647029; Thu, 04 Jul 2024 17:34:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720139647; cv=none; d=google.com; s=arc-20160816; b=gyFZzYq+GNfJVbx+ORP7M284xWKYJpzefB0++ODPFpCoZ8y4qFFXQ8vfATNX8OphIx LP9BLt34G5SweiiSivVxstwtMDpa2CnngX3o6KmN92AmlamgX76ya1C3mCNjLPEO51dw V2RVPpvyaz+7eYoUAz0GvMcv7rGJt89ptWKzfB0Haxt4tIerbD6K1ghpXcy1Q+HUTKVP FbIa0YyJ72DVtvnkDWYqLhIEw5QMSJQ9FkwNZFrtVpXsyzRimWMLEq5ZRmtu/VEkE0g7 xD+ES7/yHnXLAifnI1u7VOIOAQYMECabrHarQEhV5l82OY7wYW92NE+qLhHyIIjmAtQt buyA== 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=EMcHF0w8wjmnSXTzqRafBTQvs3ux3JlaAehLbV39e2I=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=qKhnEkfVcZZyF82Qtbohe5E+jvjHU+3bHVc5kgO++11qQC1D08vDARtv8m5DhTWbhX o5M3yOCv6KhSC6V8HMrFuro7hlyAr21mJeyky7Z8BTHV7v31MpDgCmYfUzlr/PXrr4bu ksTb8LmbXcLeZ3J+S/qj6i4WJ8EeRMuZrtL7CAmQ/NnstIxbNSJpeCgn3cXThyz8C4Qo 7GjhbJjXlKYRE4dVLDB4Dbg98WazKQaHbh5tt6eUFbp66g+/2liwktjI/vowplm2DXg/ NIHkVIRkV7lX1bhUdNMRyqfGQ9AvsKixNg94piQ+79vmAtVjAjN3/uHWZHICOWMl+HWJ Xj0w==; 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=VSOoN6hi; 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 38308e7fff4ca-2ee92902262si2828911fa.418.2024.07.04.17.34.06; Thu, 04 Jul 2024 17:34:07 -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=VSOoN6hi; 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 511C268D91A; Fri, 5 Jul 2024 03:22:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 469FC68D9FF for ; Fri, 5 Jul 2024 03:22:01 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 8535C40002 for ; Fri, 5 Jul 2024 00:22:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1720138920; 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=F3vdqrVaD4mtno25xXlzQ+1kt0JflLe7X1a1OwjpQA8=; b=VSOoN6hiPFhhTC47U8yAGqa4uxYPD26EfVwwhikFJ0jM2QakRPqiUioI3OOQefGhu5HOJ8 QfKoN/wjCA9XD/oyLFXRnCDSrx6V0tME2n5KdJPBEg+yvLf7DzO5pIQ8PR58VFXWc0dANw Pm/cPCC2P3Tbmb9UVaCt/FKNSNscwFkI5hsUVYJieuE7+BYs77z8L5BU29slK1kxsYDpqO vNKVwR16sP9IlKnZ6GQxgcJddSL6fzqfW9A0g3UQo1QhGq5o2URnpkTYZqH3ILymhQtBEa hoDE7HypcW0NxxiSItEvJIUBNcbAu/8aXL2WShdqEWyqH7iHsyt2p+EfGvXxwQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 5 Jul 2024 02:21:46 +0200 Message-ID: <20240705002156.1964272-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240705002156.1964272-1-michael@niedermayer.cc> References: <20240705002156.1964272-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 05/15] avcodec/golomb: Assert that k is in the supported range for get_ur/sr_golomb() 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: chrHGDwR0L2d Found by code review related to CID1604563 Overflowed return value Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/golomb.h | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h index 9f60fe03976..742334978d5 100644 --- a/libavcodec/golomb.h +++ b/libavcodec/golomb.h @@ -402,6 +402,7 @@ static inline int get_ur_golomb(GetBitContext *gb, int k, int limit, log = av_log2(buf); if (log > 31 - limit) { + av_assert2(log >= k); buf >>= log - k; buf += (30U - log) << k; LAST_SKIP_BITS(re, gb, 32 + k - log);