From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 1856C45EF3 for ; Wed, 17 May 2023 20:32:08 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D564B68BD75; Wed, 17 May 2023 23:32:05 +0300 (EEST) Received: from mail-ot1-f52.google.com (mail-ot1-f52.google.com [209.85.210.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 27C8968B577 for ; Wed, 17 May 2023 23:31:59 +0300 (EEST) Received: by mail-ot1-f52.google.com with SMTP id 46e09a7af769-6ab362d7401so1101129a34.2 for ; Wed, 17 May 2023 13:31:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684355517; x=1686947517; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=Yb0X2ei0v9epqk2XBR6b3vb78VunF6iJKqRGkdMt2eo=; b=b8rwumEpeApyKlZGOk3EjpBP9GQbGc4XGWHtpODAf/YF7RWD2eVH+gAaATcptfXMMf YiNIlevjp8fZ7Wr0iKzcmv7BRtQMRvbU3afu6JdE4Sxd3DOZsjMUofGuBnKjeqUsHVwW dV8imt8FOtexqTUaZKDqth3rkIB1BVoa737oLHGTg0hRt0g09VtRIaVJ1EpGrq1P8sct nYKvreH4g01UwDALox4Jldf6oQx0OqJHLOCbcO5dWgyXyRHT8W/R9845/XH1PHZ5oNUo 3PxCKXvATRwLxNyCB1fhaaRG/j854X0BBDGXxA3ps/gnVvK1NAU9CkVEPWBijupwimmt l2tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684355517; x=1686947517; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Yb0X2ei0v9epqk2XBR6b3vb78VunF6iJKqRGkdMt2eo=; b=dqPudHh4ICPM6G3gBz4gmr+0iU8lTXoHFxFHUJNm/bA3a7R0DEcL6Z0gcKQD0Pdlpg stTDadRlst3V7kkDZpRk91eSXudnAs1rYdKN/u8u1zwB2fCMFQnF9MJLgz13Ncfk9HN9 kcEXl+F0H7lgRuuke2zrLWyVnKxDMlEAPXE+AUqhVTmVaD8GPwcHTo+sgYeKuFMKg7RF KXnjl1/aj2DXAGBadYEwyLnWFjJGxvkljWTOQ3G7wu7bGqVyYvL2Yc1DFOngd4QeJB6+ f3Uqm2eRRMuJusX6HjfzMDnTrRLLbY3+k/PIVJB+RgeRIus8NJsVERMXjaw/LRFLWh+p SW3g== X-Gm-Message-State: AC+VfDyUPRHUQeHjrlM7hC3Y3rc8aQedeDIPsupHCzOoToKRlUuRgpX9 YqQfA8vRPJkMtyWU/AMdMBD1fbsjKqc= X-Google-Smtp-Source: ACHHUZ7rXyiezEk+fZeK+LTI89i9iQmuJN4ncpqTLybgJ+dPjjeeCjtY25nx1Dm775zObz808y51Dw== X-Received: by 2002:a05:6870:8805:b0:195:fd22:ab00 with SMTP id n5-20020a056870880500b00195fd22ab00mr31745oam.54.1684355516785; Wed, 17 May 2023 13:31:56 -0700 (PDT) Received: from [192.168.0.12] (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id n3-20020a056870880300b0018b12e3a392sm2467oam.42.2023.05.17.13.31.55 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 17 May 2023 13:31:56 -0700 (PDT) Message-ID: Date: Wed, 17 May 2023 17:32:05 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20230517172854.16598-1-michael@niedermayer.cc> From: James Almer In-Reply-To: <20230517172854.16598-1-michael@niedermayer.cc> Subject: Re: [FFmpeg-devel] [PATCH] avcodec/hevc_ps: add proper bound checks around cm_ref_layer_id in colour_mapping_table. 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 5/17/2023 2:28 PM, Michael Niedermayer wrote: > From: Clement Lecigne > > Signed-off-by: Michael Niedermayer > --- > libavcodec/hevc_ps.c | 17 +++++++++++++---- > 1 file changed, 13 insertions(+), 4 deletions(-) > > diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c > index a55bced0f7..313ebef151 100644 > --- a/libavcodec/hevc_ps.c > +++ b/libavcodec/hevc_ps.c > @@ -1374,9 +1374,14 @@ static void colour_mapping_octants(GetBitContext *gb, HEVCPPS *pps, int inp_dept > } > } > > -static void colour_mapping_table(GetBitContext *gb, HEVCPPS *pps) > +static int colour_mapping_table(GetBitContext *gb, AVCodecContext *avctx, HEVCPPS *pps) > { > - pps->num_cm_ref_layers_minus1 = get_ue_golomb_long(gb); > + pps->num_cm_ref_layers_minus1 = get_ue_golomb(gb); > + if (pps->num_cm_ref_layers_minus1 >= 63U) { > + av_log(avctx, AV_LOG_ERROR, > + "num_cm_ref_layers_minus1 shall be in the range [0, 63].\n"); The spec in section F.7.4.3.3.5 says 0..61, no 0..63. I'll amend this (and update the array in the struct while at it) and push. > + return AVERROR_INVALIDDATA; > + } > for (int i = 0; i <= pps->num_cm_ref_layers_minus1; i++) > pps->cm_ref_layer_id[i] = get_bits(gb, 6); > > @@ -1397,6 +1402,7 @@ static void colour_mapping_table(GetBitContext *gb, HEVCPPS *pps) > } > > colour_mapping_octants(gb, pps, 0, 0, 0, 0, 1 << pps->cm_octant_depth); > + return 0; > } > > static int pps_multilayer_extension(GetBitContext *gb, AVCodecContext *avctx, > @@ -1439,8 +1445,11 @@ static int pps_multilayer_extension(GetBitContext *gb, AVCodecContext *avctx, > } > > pps->colour_mapping_enabled_flag = get_bits1(gb); > - if (pps->colour_mapping_enabled_flag) > - colour_mapping_table(gb, pps); > + if (pps->colour_mapping_enabled_flag) { > + int ret = colour_mapping_table(gb, avctx, pps); > + if (ret < 0) > + return ret; > + } > > return 0; > } _______________________________________________ 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".