From patchwork Sun Nov 6 12:34:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39190 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp1529950pzb; Sun, 6 Nov 2022 04:34:59 -0800 (PST) X-Google-Smtp-Source: AMsMyM4dWfnbmb1LdPgqe7XhGIkEfyR1yuvD+b3LjYbG6EyXrAWMGw1VupwiI6X+EDNJV7w0mhdu X-Received: by 2002:a50:a6d2:0:b0:461:8a43:e93 with SMTP id f18-20020a50a6d2000000b004618a430e93mr574435edc.275.1667738098895; Sun, 06 Nov 2022 04:34:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667738098; cv=none; d=google.com; s=arc-20160816; b=r7+tvvPSLSoMf/eYj0gpdWvzvMIZlA4UJpRkDK+QH3vP9hKp2Blfy9ypTjrqLMDfNE 0iAKXyIQ7lSi7jxu/L9gJAK8KqkI6iN8don11XwCBd5UFwz3oEA0Jq4MHE6ruyzkjl03 6RKW0Hlkr6ZFPs6aDAzHLI8Wvqnu+rOxQgtyLOdH/vaXykZZgsIBWuBrXgw0fmG5L67T +gLUxyDfovEVBaa13k9TYYNn+XEZJpNWNLFeBl2ktHlJG7cBpkZu0t2n1D4NNckgzIyN ObPOvhp8jNWrX+hYrPxUjSFhs2o1c6Rd1udTY9HyXwcgXYE5fBO/iapG3MnKKGIKJ4Yn BHyA== 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=rmLB7WtOyiV0EFALWG96j+N7w5jAi9jV3G9YtpIuHFk=; b=yCfZzHO24a1LwmqsgwrlfrKi48aeoYFeEx9ju1IaN4P/ZXDWcV4YDRPPSiDA88Z4Xy E8ih4OGsj5W6E6evvs5r9ruzaieucHljgwXOWYg0VvNqEa9oXjMZXbGK0+nT4o2/0eOZ N1gd8A7khNEK1bh7rA9x8QsX5PZ5bugRjIcSGGGDfTpHuCb17l5zLVPZY9NtEII0y5co 100oeYOjmzUVBO41TbK/xTGM3X8dmMjY4hSAWPyo6E26fzDg4ccb+zR0OStAqUWlx8FK qgiFOgLrvkgJIGRsWCfanlSzFBCFoRkyBvH5USFgMwJEvh0GG00yLdGwFemKB8iDTgRc 2WTQ== 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 ht14-20020a170907608e00b007ae4717bf08si5979024ejc.359.2022.11.06.04.34.58; Sun, 06 Nov 2022 04:34:58 -0800 (PST) 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 2405868B6F0; Sun, 6 Nov 2022 14:34:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AA3AA680A26 for ; Sun, 6 Nov 2022 14:34:37 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id D5DBFFF803 for ; Sun, 6 Nov 2022 12:34:35 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 6 Nov 2022 13:34:26 +0100 Message-Id: <20221106123430.1668-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221106123430.1668-1-michael@niedermayer.cc> References: <20221106123430.1668-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 3/7] avcodec/bonk: Remove special 32bit case from read_uint_max() 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: igSJnZObUTdK This case seems not to match the reference decoder and it also seems not reachable Signed-off-by: Michael Niedermayer --- libavcodec/bonk.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/bonk.c b/libavcodec/bonk.c index 04ea4def2f..fca8c246aa 100644 --- a/libavcodec/bonk.c +++ b/libavcodec/bonk.c @@ -136,8 +136,7 @@ static unsigned read_uint_max(BonkContext *s, uint32_t max) if (max == 0) return 0; - if (max >> 31) - return 32; + av_assert0(max >> 31 == 0); for (unsigned i = 1; i <= max - value; i+=i) if (get_bits1(&s->gb))