From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
	by master.gitmailbox.com (Postfix) with ESMTP id E308142F2F
	for <ffmpegdev@gitmailbox.com>; Mon, 16 May 2022 01:25:07 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
	by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D1E4868B50E;
	Mon, 16 May 2022 04:25:04 +0300 (EEST)
Received: from mail-oi1-f172.google.com (mail-oi1-f172.google.com
 [209.85.167.172])
 by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 432CD68B482
 for <ffmpeg-devel@ffmpeg.org>; Mon, 16 May 2022 04:24:58 +0300 (EEST)
Received: by mail-oi1-f172.google.com with SMTP id l16so17000395oil.6
 for <ffmpeg-devel@ffmpeg.org>; Sun, 15 May 2022 18:24:58 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;
 h=message-id:date:mime-version:user-agent:subject:content-language:to
 :references:from:in-reply-to:content-transfer-encoding;
 bh=UlHAkBx2CVErAnVhXroGVbU2hTgGtM0yfpRMztesokM=;
 b=gCgbuezC/A1x/8hQuv2DgEjYFSWO+gF5PZ8XB0AjpdXcoQ7AGvLZigDA3QGdvyugi6
 UpAWOv6EM9l6PQIsJfMigFT9dmPq/aFb2eTZURmlXU1E4/wVgKi+HNRRsAHKNBX93FeG
 r8lBDA+/L6L5mPAIqGMol3Z5xGGTK8LbcnA/wkxLCg5ppmwTh7rhBnmVMrG4pDOY8OoR
 2XGeHppV1mn1SyCqHQuH0G5nAbZhteGNfgsMIOw4RdTmq+FjsgFi6lTUUYd5Zks4Vi5D
 56U7QrQuDvlPydN3qAgHe3zwL08XlIdRtx545CAyrkQkF89AK/Ceq9uxoyadlmG9se8r
 irgQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20210112;
 h=x-gm-message-state:message-id:date:mime-version:user-agent:subject
 :content-language:to:references:from:in-reply-to
 :content-transfer-encoding;
 bh=UlHAkBx2CVErAnVhXroGVbU2hTgGtM0yfpRMztesokM=;
 b=PXA+PyTavF88dg87PmxPgox+u9lC0ykWB72fAS8aT3ppUOxf7q3hk57wPKLeu9CY2y
 bp8AtnxjsZWxHiD+4xG6mqNQSliyT9qEAU0qIzbxP+FZP+d3MoonmfoefAUDPQojGIu0
 Nu7du90+JrVBKwbuuJtHljOjPLD9ieSYdd6uimbR6lyG+EnLr7Qw7ofx5jUikXEyeznY
 xJHChmJ+f24A4ep1d9fubP3976G75CtE9VJg3AAU8b6uza8Y3xSLKIQrsSsSIdWC1UAg
 yRLiGnsJ/NCAcio5Eel2K6D4BLxiUsL/dKOgwnv+IzV9lk5o/s7qpAupXP6ldy0CHul7
 hWQw==
X-Gm-Message-State: AOAM531h0/GsoypEW4/QKm9NIuQjAOM0Z00XijaKmSxp/nnXOdtpp7E2
 CInGC9SvP4BngR1SlrfY3qp/7SjkpQ8=
X-Google-Smtp-Source: ABdhPJybYQj4QijhMCEokmzTxvVkn3MP7mRlwEy74xktGXIPnIBzCaYOE/X42rfla1X7WIC4lvKeww==
X-Received: by 2002:a05:6808:ecc:b0:322:319c:cd3 with SMTP id
 q12-20020a0568080ecc00b00322319c0cd3mr12513726oiv.148.1652664296020; 
 Sun, 15 May 2022 18:24:56 -0700 (PDT)
Received: from [192.168.0.13] ([186.136.131.95])
 by smtp.gmail.com with ESMTPSA id
 h26-20020a9d799a000000b0060603221236sm3485891otm.6.2022.05.15.18.24.55
 for <ffmpeg-devel@ffmpeg.org>
 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
 Sun, 15 May 2022 18:24:55 -0700 (PDT)
Message-ID: <dbe17fa0-24a0-1efc-77e1-7f5fefa08b73@gmail.com>
Date: Sun, 15 May 2022 22:24:53 -0300
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Thunderbird/91.9.0
Content-Language: en-US
To: ffmpeg-devel@ffmpeg.org
References: <20220516011605.18792-1-michael@niedermayer.cc>
 <20220516011605.18792-3-michael@niedermayer.cc>
From: James Almer <jamrial@gmail.com>
In-Reply-To: <20220516011605.18792-3-michael@niedermayer.cc>
Subject: Re: [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 <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
 <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
 <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="us-ascii"; Format="flowed"
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/dbe17fa0-24a0-1efc-77e1-7f5fefa08b73@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>



On 5/15/2022 10:16 PM, Michael Niedermayer wrote:
> Maybe helps coverity
> Helps: CID1433771
> 
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>   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);

Group is used as index to access two arrays with 22 elements each at the 
beginning of the while loop here. Maybe just also check for group > 21 
and abort like we're doing for < 0, since it's clearly not a valid or 
expected value.

>               /* Escape */
>               if (idx > 63)
>                   return AVERROR_INVALIDDATA;
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".