From patchwork Thu May 25 21:40:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 41831 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51c:b0:10c:5e6f:955f with SMTP id gm28csp865618pzb; Thu, 25 May 2023 14:41:34 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ59ZqUwA2ygqsplze+ThGQ4lV4clXJ3Ex44S5/dhT+eMZlPVzej2cm4F2BCtEPQGN9RLf09 X-Received: by 2002:a17:907:3f27:b0:961:be96:b0e6 with SMTP id hq39-20020a1709073f2700b00961be96b0e6mr105942ejc.68.1685050894002; Thu, 25 May 2023 14:41:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685050893; cv=none; d=google.com; s=arc-20160816; b=Vx3VCW4I04fyBv3d7DoAaOyVIw10X+FFVpKoCmYpiiFkhRUmJvDyHRamTHE542U/+2 NRALbLktGfkAq3wiv4kUWTu4FWv3/GOyOAn4MYwyuPqtagFlV7T+7l6SM6wMfxqeirMo Rr7FIP6Juh7C66XY3O6PMUTBVsAh/zsp+A7bfZsXP9kMLLvA58MlkR8CwhMRV2VkNN/p q4q/LlO6sBQfNRmPyTV4e4mw7C0vnCYDArh3Bgbt2XNDSQVPfP9NrZ0xKZJZKwgvN1TC zTmxyv+EFAC5RxsnDzWUMye3pMgMKji4SCiJI0fZf+rOSwMFjhG3+OTKls4Vv5/4vXy4 nhlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=hdLMXYg2LuJ8RsRkW+vgHoa74lWFe/txWBHXJTQQDmw=; b=CebZzz4hJg6U/6KuKsatNo7XzXrbtgNV3L1gUJCsp/C08qbOn3Wc+Z9SdDSsmj0GAo HifKJJKYGymt0Qt1plRFNg5QSNNBMzc2RAzh+chNb0wSFggItX/auwVsVFqwJtKKT7v2 3FY48djADwHVGUKovxlCf0x8m9HBy+5IG0so8jA5/FRk/zFozebVBBUXPAZfq84ZVRWT qpjoKvszUdK5q0aCbwQQloUD/8t+QAlrddMNnK31Tmr3r1FvweIInMpG3BdfBZcFB+qi 5/JO2ssuf8x/w8HUf1ePNY9UOyMLjN9qfVL9K2e/iHS4zdfMF66p2A4VO+JImOy0wpzp +01g== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id jz21-20020a17090775f500b0094f442c8a6dsi1739967ejc.291.2023.05.25.14.41.18; Thu, 25 May 2023 14:41:33 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B4FC968C1EC; Fri, 26 May 2023 00:40:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 123FE68C1AB for ; Fri, 26 May 2023 00:40:25 +0300 (EEST) X-GND-Sasl: michael@niedermayer.cc Received: by mail.gandi.net (Postfix) with ESMTPSA id 76A1220005 for ; Thu, 25 May 2023 21:40:24 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 25 May 2023 23:40:19 +0200 Message-Id: <20230525214019.29048-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230525214019.29048-1-michael@niedermayer.cc> References: <20230525214019.29048-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 5/5] avcodec/hevc_refs: Check that nb_refs stays <= HEVC_MAX_REFS 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Td5AYS/S/vfj Fixes: 58528/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HEVC_fuzzer-5834725318328320 Fixes: index 16 out of bounds for type 'int [16]' Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/hevc_refs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c index e9be02c489..0716e1a597 100644 --- a/libavcodec/hevc_refs.c +++ b/libavcodec/hevc_refs.c @@ -353,7 +353,7 @@ int ff_hevc_slice_rpl(HEVCContext *s) } } // Construct RefPicList0, RefPicList1 (8-8, 8-10) - if (s->ps.pps->pps_curr_pic_ref_enabled_flag) { + if (s->ps.pps->pps_curr_pic_ref_enabled_flag && rpl_tmp.nb_refs < HEVC_MAX_REFS) { rpl_tmp.list[rpl_tmp.nb_refs] = s->ref->poc; rpl_tmp.ref[rpl_tmp.nb_refs] = s->ref; rpl_tmp.isLongTerm[rpl_tmp.nb_refs] = 1;