From patchwork Mon May 16 01:16:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 35786 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp1324007pzb; Sun, 15 May 2022 18:17:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx1KujAiZGGzpqpyOD/HhHD7RFYbzS7ZZKVHe7QMvx2mY7wsStbGJkhGiDviz2OdQz5yIn6 X-Received: by 2002:a05:6402:268d:b0:428:c73:95c4 with SMTP id w13-20020a056402268d00b004280c7395c4mr10584259edd.44.1652663842665; Sun, 15 May 2022 18:17:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652663842; cv=none; d=google.com; s=arc-20160816; b=Kvw5hk86C/NKaCzyYnXOfs/m+3l7J7KtYSL7y3zG+SuRzSPTpRMFlMz2NQqCWzNzfC oRKN2PkZOhBZKRYLtLAIq0BYjrjlWz5gVqLAzxrjKajfBAGt24/7GomKVOezmkM/4NzE bWytSMOvx+e7wZD/CE7BgyiVhWnOXW9lz7VsiFdOaJR3Wz+w/SVmoic63peOY4/CUT/F fNGLn5f/LpcCqYAzWkWCJ4j/HXy+6Snza/dOTbAfPRlGqNij9Wa4z1JSs9zsLJMKErZk FFmvKLjmDUHhVk0IJ40CenWIX0ywfWkl60EClRoZ4yHHqhtAh5GQaPsY5STkau8S/jvU NmMA== 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=nNQ1QL04PDanoPKjh5JIkrhWVo2lnEiOzaTj7xB2jzc=; b=MQGbayA8oIfSgAJuy7PEQgkX2tDqOsBE4xSjlX7HZV/8sSeczHAzx14NUC6LMtwDGV aLanyeyP3+CukrwmLwe2F+qofgZx5vhL+NI8VUuK2lHkA7Rtn7RoE+DIwo9nTBrQmk2d dySNzodkfzuK19+pL6RnLX1ldOy5eZ12+Ckk8KsWG0Rh0WxiyJpLDXjOXn4yMJ1qSKF1 s5jhYBBAD8ynGjO4pUfKLN/HMHyVPKj77tEDb7nOEnQBFLJR3eGnayHx4DuTEwoLOyxZ N1xhuKF1iBs6sbrrJLnFt/9wCtoY9+M58QJBrE5btoMli4qLkI1nUNFe/dYNFPTyk5lU dtVQ== 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 r25-20020a170906c29900b006e8666ecf83si9187938ejz.144.2022.05.15.18.17.22; Sun, 15 May 2022 18:17:22 -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 7528168B507; Mon, 16 May 2022 04:17:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-1.mx.upcmail.net (vie01a-dmta-at03-1.mx.upcmail.net [62.179.121.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A58AC68B4F7 for ; Mon, 16 May 2022 04:17:13 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nqPMA-0003wo-1q for ffmpeg-devel@ffmpeg.org; Mon, 16 May 2022 03:17:06 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id qPL8nCu4S8s8UqPMAntbHp; Mon, 16 May 2022 03:17:06 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id qPLCnOEXk8eSWqPLCnsHAy; Mon, 16 May 2022 03:16:06 +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.4 cv=KKE5sHJo c=1 sm=1 tr=0 ts=6281a5d6 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=_fnZI6VXZRqDDjkLB6gA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 16 May 2022 03:16:05 +0200 Message-Id: <20220516011605.18792-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220516011605.18792-1-michael@niedermayer.cc> References: <20220516011605.18792-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfCFHxJWtBlrFa4J7m3UHG7Wqr7K+cwwt3w9JcSwtSlMcATKElVvpNQcfmV9zoszZx8h3XRTbmsrErFd1ijGjmMTSHMqiD4MVIrbKZS5jMttbCN1A5l3z /WOLcoukKnypVTNGGAgpxrx6mLf4ABFoVCofABbQGTeq7ruCXg3SbF+aVddnCi34QLU9xOqGiIPT2w== Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/mpeg4videodec: Replace always true check by assert 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: w74v8QT+EdXR Maybe helps coverity Helps: CID1433771 Signed-off-by: Michael Niedermayer --- libavcodec/mpeg4videodec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index e2bde73639..715cb606c9 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -1981,7 +1981,8 @@ static int mpeg4_decode_studio_block(MpegEncContext *s, int32_t block[64], int n return AVERROR_INVALIDDATA; j = scantable[idx++]; block[j] = get_xbits(&s->gb, additional_code_len); - } else if (group == 21) { + } else { + av_assert2(group == 21); /* Escape */ if (idx > 63) return AVERROR_INVALIDDATA;