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 ESMTPS id 472C34A12F for ; Wed, 29 Jan 2025 08:40:49 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 510DB68A778; Wed, 29 Jan 2025 10:40:45 +0200 (EET) Received: from sender2-op-o18.zoho.eu (sender2-op-o18.zoho.eu [136.143.171.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 368AB68A778 for ; Wed, 29 Jan 2025 10:40:38 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; t=1738140033; cv=none; d=zohomail.eu; s=zohoarc; b=Y5sNIIWkKLkS4zX//Itwuk16j52VnwbtWKlEsrr3fwOQYhr7OxzHZtQMJj7e2bCfwS1K3bLNm4Yo4GoYT6vBoMGvVUNtc8zrwJRhVmldW12dAPtDjbNQhNAb6XNkAE9l/shMSIY4PFmihooj2PQuanDogdn8SQiCXRi1WJeQjKg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.eu; s=zohoarc; t=1738140033; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=hpwLG0NSwhoNnyxOHYgVzqOMLlcVzMFu0uNpo5tGRNQ=; b=SdPSO3FA/MFx6/p23w1gZgCARUV7+g68v1rQ+raOfFbVL5X0/K37LsLkZBTdNOR8SkqH0S3j621oKFlHyRL4NADqRrKXNj0fVamirf/9YuF/q2npHZFdKA8qUlOXb1kPU0pETFGXCQUXAHB0y4wNl8jxqGVus9uEcmN4WLZ8+7g= ARC-Authentication-Results: i=1; mx.zohomail.eu; dkim=pass header.i=frankplowman.com; spf=pass smtp.mailfrom=post@frankplowman.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1738140032; s=zmail; d=frankplowman.com; i=post@frankplowman.com; h=Message-ID:Date:Date:MIME-Version:Subject:Subject:To:To:References:From:From:In-Reply-To:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To:Cc; bh=hpwLG0NSwhoNnyxOHYgVzqOMLlcVzMFu0uNpo5tGRNQ=; b=T56U86VSMonUNQ9PAAO6by8QvqFBfn2yIEwttCtYtj/b7OnFzr9WaWt885KVVcNH 9x9L7QPsVF9g6DUXAEHf8SfLFgZ3e6GxjqcNQZGQ8dSshukVXOr+qCrjUAWzRUf8L8B QB9SrEvziHoxh+NiCFYiTeX+Abr6AE4P6v/9s/es= Received: by mx.zoho.eu with SMTPS id 1738140031088411.31254979107337; Wed, 29 Jan 2025 09:40:31 +0100 (CET) Message-ID: <789d2f91-d67e-47c2-b1fa-9ba23b650d76@frankplowman.com> Date: Wed, 29 Jan 2025 08:40:30 +0000 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-GB To: ffmpeg-devel@ffmpeg.org References: <20250126031021.309218-1-nuomi2021@gmail.com> <20250126031021.309218-3-nuomi2021@gmail.com> From: Frank Plowman In-Reply-To: <20250126031021.309218-3-nuomi2021@gmail.com> X-ZohoMailClient: External Subject: Re: [FFmpeg-devel] [PATCH 3/3] lavc/vvcdec: ensure slices contain nonzero CTUs 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-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: On 26/01/2025 03:10, Nuo Mi wrote: > fixes https://github.com/ffvvc/tests/tree/main/fuzz/passed/000323.bit > > Co-authored-by: Frank Plowman > --- > libavcodec/vvc/ps.c | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) > > diff --git a/libavcodec/vvc/ps.c b/libavcodec/vvc/ps.c > index c9f7c5c80f..01b4615eda 100644 > --- a/libavcodec/vvc/ps.c > +++ b/libavcodec/vvc/ps.c > @@ -1232,7 +1232,7 @@ static int sh_alf_aps(const VVCSH *sh, const VVCFrameParamSets *fps) > return 0; > } > > -static void sh_slice_address(VVCSH *sh, const H266RawSPS *sps, const VVCPPS *pps) > +static int sh_slice_address(VVCSH *sh, const H266RawSPS *sps, const VVCPPS *pps) > { > const int slice_address = sh->r->sh_slice_address; > > @@ -1256,6 +1256,11 @@ static void sh_slice_address(VVCSH *sh, const H266RawSPS *sps, const VVCPPS *pps > sh->num_ctus_in_curr_slice += pps->r->row_height_val[tile_y] * pps->r->col_width_val[tile_x]; > } > } > + > + if (!sh->num_ctus_in_curr_slice) > + return AVERROR_INVALIDDATA; > + > + return 0; > } > > static void sh_qp_y(VVCSH *sh, const H266RawPPS *pps, const H266RawPictureHeader *ph) > @@ -1352,7 +1357,9 @@ static int sh_derive(VVCSH *sh, const VVCFrameParamSets *fps) > const H266RawPictureHeader *ph = fps->ph.r; > int ret; > > - sh_slice_address(sh, sps, fps->pps); > + ret = sh_slice_address(sh, sps, fps->pps); > + if (ret < 0) > + return ret; > ret = sh_alf_aps(sh, fps); > if (ret < 0) > return ret; LGTM! Thanks, Frank _______________________________________________ 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".