From patchwork Sat Oct 5 21:05:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 52075 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:938f:0:b0:48e:c0f8:d0de with SMTP id z15csp1162410vqg; Sat, 5 Oct 2024 14:24:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVhuoiywHs32iDCOr9rBz/lmONWSezsw3UBmHGm5g4auoxgygxH6oPqqQe9sVR27HGqkdYuBModHgqBuSVlw+LU@gmail.com X-Google-Smtp-Source: AGHT+IE8/nYbwRMoT7MhbNeW+dPtRM3Uc64/EmU1AEcb8zv9FQEYm1FSp5MS1bAQpA2apMACS6s4 X-Received: by 2002:a17:907:7d89:b0:a99:44d1:5bba with SMTP id a640c23a62f3a-a9944d16428mr166123966b.45.1728163447954; Sat, 05 Oct 2024 14:24:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728163447; cv=none; d=google.com; s=arc-20240605; b=dYd9TbdozfKucwew6+j0LrgVx9TCfLSunrN7d7D7TRYtn10FDT/IDy0IzDSWJd8nyK N3PXJDEleSlYE46uH8JB8+ePCSRSh5PZ8QvZ6R3vIHm/pL9rxVpC+Zj2MjFkZbBiDPSh D5gT58b+D6/jPs/rlWtj/xXDevDTwPu/rJAMRHVPOLRXHAmBhhnx989nrGKn1cR+z5OO 3yOlwUaNfIbO7WMGOjBVYszsyTlozMGtr8E05yGrhoSVzTUfpp5UAzGW8YFcsA3zVx3D KXeFtzGFmcy7Ky9O5KGFk2WUS/KeSd1wsivpg+znDABIKmwoIuWadx0RHjw/BQZimfK6 NwUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=RpQsJ10ngig36c2iQNXP3+4YjoUK/8+jylIrdUrtXgA=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=FxsvB4Jw5+EOc4DKbM5w5vmB095v0bUx/laOZ+vvdBzyT6Nn2wLEWLOWndv8MK0ZJY O1pOszVLYy68XPmJ4BkYaiaMao3vkm3uFhFKQR7YKkE5MRNJZnxubHfjCL2a5ItKfGp6 +n7uCclos59qBjMvGCwoZrh6eP2TPvjovlPp0QH0GA/JmZSlkwxcFNBINIiuyyIFDoWq KBl1jRMR8khLjdmzZbESv43GHnFU+Q5mEATpMrCcvghWf7nexr2nWKWugDoBZAM1hDI+ QiMilct/5a4JGUHfE/nJy6oZ0/Okrks+P6JZHzhUXav/EMSgwg6XNrLfLIt2C2sboq6T 14lw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=ZUeF1atE; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a9948e0da06si37117566b.836.2024.10.05.14.24.07; Sat, 05 Oct 2024 14:24:07 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=ZUeF1atE; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 81D9B68C886; Sun, 6 Oct 2024 00:05:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0EEC568C886 for ; Sun, 6 Oct 2024 00:05:50 +0300 (EEST) Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-2e077a4b8c0so2307331a91.1 for ; Sat, 05 Oct 2024 14:05:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728162347; x=1728767147; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=gqoLoUk0LqJdK3FtGc7gCVts7y6HoDSX6KhDEiUwA+0=; b=ZUeF1atEN77rxXhPsm/yO8YGQlSS1CY4cTe1T/nnPH4/xu6MHVFPcOcz9fCrqmjOLV vRA518QlXyVt6lRVIbSuAcWWhB17nXmTAYp3Tan9vIGQUXHanerMHB2U1kelecR7XoW8 vyAAbqR1uU6Jahul/+mDqudG+yvVDOXx7zjG59NnenimjX7NaWerm0uPtV0kifeyJmrc n/WXPuHyrEQqfrauHmdJcWaEqXUAwNQfvFifRbw9u43UYt+6clyQBXgk/+JG9JGkqrF6 KfC10KvxnSJzvRhR6xmkNWM4z0CQACgcP5XRDBdIgfi4YjyqtTf9GVNLLOUXqFs9sb0T 6J/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728162347; x=1728767147; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=gqoLoUk0LqJdK3FtGc7gCVts7y6HoDSX6KhDEiUwA+0=; b=VgE6zVxkd4N8Tt7dI+tcHtlEpC9Y1ts7BDmGdpa5CYPMkyW8YDmcLIqu6kPofqsfHF KLPI3oKEyOCAG+i+XTrPFkviVVOgfAOrBgXxgKQRUzGc7Yh+IUg8/bee22GJ2fd2pASU Wgnh1NSFV8EmS3WpmxJ02WM04w95u23EsQyMWf5HVbYSJ3nuZsmvFIuGqmFnBs4HGdmL cTncVeMbtLtiGrRrnE7kDFfQD6JLo3Ad5AHAFdcaHaqStzMqsQLx6n3ayo+yjXSV8XOG bqDYrvVupLhWnIYaSr/Jybp9NCoTmC0WkYiylIrDuaY53n0ZNScxNoPcm+Jfd59nC2kW nkDA== X-Gm-Message-State: AOJu0YwGeUSyTKKujs8/2+e+3jEdlJy6tNgC8eq1PD7OzchVDnM3TCZZ BeEHDLx0+tCAeF6fby8k8NMrTd4mC1b2ZXbBjlJ0YvSpIhDlIMY3OEnHww== X-Received: by 2002:a17:90b:33c9:b0:2d8:b510:170f with SMTP id 98e67ed59e1d1-2e1b398fe46mr13583461a91.20.1728162347078; Sat, 05 Oct 2024 14:05:47 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e1e85db34fsm4014593a91.33.2024.10.05.14.05.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2024 14:05:46 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 5 Oct 2024 18:05:30 -0300 Message-ID: <20241005210530.7189-1-jamrial@gmail.com> X-Mailer: git-send-email 2.46.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/hevc/ps: add a range check for sps_max_sub_layers 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: CxuLe8cxrwna It can't be higher than vps_max_sub_layers. Signed-off-by: James Almer --- libavcodec/hevc/ps.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libavcodec/hevc/ps.c b/libavcodec/hevc/ps.c index 993c60144f..bd01f63956 100644 --- a/libavcodec/hevc/ps.c +++ b/libavcodec/hevc/ps.c @@ -1172,17 +1172,16 @@ int ff_hevc_parse_sps(HEVCSPS *sps, GetBitContext *gb, unsigned int *sps_id, } sps->vps = ff_refstruct_ref_c(vps_list[sps->vps_id]); } + if (!sps->vps) + return AVERROR(EINVAL); sps->max_sub_layers = get_bits(gb, 3) + 1; multi_layer_ext = nuh_layer_id > 0 && sps->max_sub_layers == HEVC_MAX_SUB_LAYERS + 1; - if (multi_layer_ext) { - if (!sps->vps) - return AVERROR(EINVAL); - + if (multi_layer_ext) sps->max_sub_layers = sps->vps->vps_max_sub_layers; - } - if (sps->max_sub_layers > HEVC_MAX_SUB_LAYERS) { + + if (sps->max_sub_layers > sps->vps->vps_max_sub_layers) { av_log(avctx, AV_LOG_ERROR, "sps_max_sub_layers out of range: %d\n", sps->max_sub_layers); return AVERROR_INVALIDDATA;