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 1B52245EC5 for ; Fri, 15 Sep 2023 13:11:58 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D69FF68C756; Fri, 15 Sep 2023 16:11:54 +0300 (EEST) Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CB4D668C6B3 for ; Fri, 15 Sep 2023 16:11:48 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id E534CC0006 for ; Fri, 15 Sep 2023 13:11:47 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 15 Sep 2023 15:11:44 +0200 Message-Id: <20230915131147.5945-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/evc_ps: Check cpb_cnt_minus1 and propagate error 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Fixes: out of array access Fixes: 60949/clusterfuzz-testcase-minimized-ffmpeg_dem_EVC_fuzzer-5959738853294080 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/evc_ps.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/libavcodec/evc_ps.c b/libavcodec/evc_ps.c index 64384a392c2..7fe13fd32f0 100644 --- a/libavcodec/evc_ps.c +++ b/libavcodec/evc_ps.c @@ -53,6 +53,9 @@ static int ref_pic_list_struct(GetBitContext *gb, RefPicListStruct *rpl) static int hrd_parameters(GetBitContext *gb, HRDParameters *hrd) { hrd->cpb_cnt_minus1 = get_ue_golomb_31(gb); + if (hrd->cpb_cnt_minus1 >= FF_ARRAY_ELEMS(hrd->cpb_size_value_minus1)) + return AVERROR_INVALIDDATA; + hrd->bit_rate_scale = get_bits(gb, 4); hrd->cpb_size_scale = get_bits(gb, 4); for (int SchedSelIdx = 0; SchedSelIdx <= hrd->cpb_cnt_minus1; SchedSelIdx++) { @@ -71,6 +74,8 @@ static int hrd_parameters(GetBitContext *gb, HRDParameters *hrd) // @see ISO_IEC_23094-1 (E.2.1 VUI parameters syntax) static int vui_parameters(GetBitContext *gb, VUIParameters *vui) { + int ret; + vui->aspect_ratio_info_present_flag = get_bits(gb, 1); if (vui->aspect_ratio_info_present_flag) { vui->aspect_ratio_idc = get_bits(gb, 8); @@ -109,11 +114,18 @@ static int vui_parameters(GetBitContext *gb, VUIParameters *vui) vui->fixed_pic_rate_flag = get_bits(gb, 1); } vui->nal_hrd_parameters_present_flag = get_bits(gb, 1); - if (vui->nal_hrd_parameters_present_flag) - hrd_parameters(gb, &vui->hrd_parameters); + if (vui->nal_hrd_parameters_present_flag) { + ret = hrd_parameters(gb, &vui->hrd_parameters); + if (ret < 0) + return ret; + } + vui->vcl_hrd_parameters_present_flag = get_bits(gb, 1); - if (vui->vcl_hrd_parameters_present_flag) - hrd_parameters(gb, &vui->hrd_parameters); + if (vui->vcl_hrd_parameters_present_flag) { + ret = hrd_parameters(gb, &vui->hrd_parameters); + if (ret < 0) + return ret; + } if (vui->nal_hrd_parameters_present_flag || vui->vcl_hrd_parameters_present_flag) vui->low_delay_hrd_flag = get_bits(gb, 1); vui->pic_struct_present_flag = get_bits(gb, 1); @@ -292,8 +304,11 @@ int ff_evc_parse_sps(GetBitContext *gb, EVCParamSets *ps) } sps->vui_parameters_present_flag = get_bits1(gb); - if (sps->vui_parameters_present_flag) - vui_parameters(gb, &(sps->vui_parameters)); + if (sps->vui_parameters_present_flag) { + ret = vui_parameters(gb, &(sps->vui_parameters)); + if (ret < 0) + goto fail; + } // @note // If necessary, add the missing fields to the EVCParserSPS structure -- 2.17.1 _______________________________________________ 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".