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 AE8E94CD35 for ; Sun, 26 Jan 2025 03:11:12 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4F94E68B9EF; Sun, 26 Jan 2025 05:10:55 +0200 (EET) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A8C7368B9D3 for ; Sun, 26 Jan 2025 05:10:48 +0200 (EET) Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2164b662090so64719925ad.1 for ; Sat, 25 Jan 2025 19:10:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737861047; x=1738465847; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5PoeC1gHsOVdC3WscWUKdQHPiSNcCZdv6zZcXYx2N64=; b=J7+xS7fDFDRk2VmHOiy+4jnq1r/OqvJvxePhb2UfT2yOIyYqWcROFmiprtyPOvrIAh Yy4G0GVyAyBcPDlUVNR5o4Mk0jKzvaWnWwizr4IAclFDJe+zbh/Evm623lWt4DNopQa/ hM5E+z4AWkFlf1x0hGd/jkpmzPxJsY4lIiGTXXZGaDJi+9NTw2O7S4xpbJS3uLVflXN2 opIZyMTLUoHwEWAaNA73t23zu1f4FieZeCr3UA77L5MFyaBGTVNN3iZnziPz3Pn0R8fE x1+lZKC88gxtJ7zHFd3rgngnn64rRhMSZ0C6CznZ2CbO92tQf3L6erYNMitnd5p25qVh T03A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737861047; x=1738465847; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5PoeC1gHsOVdC3WscWUKdQHPiSNcCZdv6zZcXYx2N64=; b=qeu+Ey7CbXHGgksNgwKXo1MjH1Jq//6Ce1EmLwSvHN9yEHvxmm5TVqx+X783lu2ewM hvkRHnNXYAUzE9E5IPIrLY5NW3hLyo2iFC2CV2Zd3e3vsB3CyhcalxFt5m4n9m/w3OcR DN0krJCzxd+bZN3+pn+9kqPCrmMtkIBD8OZuk6JhmzkTmv875jMWQCOhMt4fqFR7UkQZ IwS6hmj7tikibfl4FSRC943vMjI1GCvxbf5HFKpdGpn+TcPCpdlyiBz9HsXHOrcTBt5L U7toDLlLx2PY2MUGvhwgwj1KrGpdEQ8tHz2cABp1vDjRQPh7wt9oTUdcaZp7iGmwLKsx SByA== X-Gm-Message-State: AOJu0YzoWxQaYQfqCqSDdzJ2oSiX5ahEMZ0cUS3YN0Vl37JCqLHgiZ1o /soV4khGTf/1wLpBKxM90RreSx9cdRXOtYyS8hi2GLuCmboNbZdq1WSv9gsM X-Gm-Gg: ASbGncsr+1iqsvzkyss2fa5sKi7y9acSKkUhJSVBCeT1o8SzqSJ3zd0GIAYtimQ4AIB lWq0hfsgPNQxSjb1vpYTt7lgkbHfY0Pi3RTxn1DKZg9+4IkNXYvA1OBQyeFfc6jx//FtEwBiTV8 AJ6NZtLjdyrDlbLdDgyYy2mM8F4OWxG7c9UNCWsUQwDBY0/QO4RzIKtUi83wNVUM1VREYMRIVAm uur9ovfQrWOwguoOXKJF8apkuNQknehk7YDgg+fHP7OiIvEnQ1B49ZCjmWwnSbOS/dleXAwAw== X-Google-Smtp-Source: AGHT+IFEVyYykChkDdrS1tC5lUQNn4FCtqaYHQJ+zdqRo9DVlm0mR5Kl8YjFteAgMf1xyaSlzLAtLg== X-Received: by 2002:a17:902:fc8d:b0:215:4a4e:9262 with SMTP id d9443c01a7336-21c351cb1a5mr428954435ad.8.1737861046849; Sat, 25 Jan 2025 19:10:46 -0800 (PST) Received: from localhost ([112.64.8.17]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21da3ea3ba3sm39024525ad.58.2025.01.25.19.10.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Jan 2025 19:10:46 -0800 (PST) From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Sun, 26 Jan 2025 11:10:21 +0800 Message-Id: <20250126031021.309218-3-nuomi2021@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250126031021.309218-1-nuomi2021@gmail.com> References: <20250126031021.309218-1-nuomi2021@gmail.com> MIME-Version: 1.0 Subject: [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 Cc: Frank Plowman , Nuo Mi 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 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; -- 2.34.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".