From patchwork Fri Apr 26 23:52:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 48281 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1509:b0:1a9:af23:56c1 with SMTP id nq9csp698200pzb; Fri, 26 Apr 2024 16:52:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU48j3yEJISH+Gn2z3QTx9FrsfJXRMzWFveR11QJiUbgxVhU4h9GCgKVlqYz3OFd+igma1Zz45823Z0a34wctvNM83AJ4bjew4+1A== X-Google-Smtp-Source: AGHT+IHAY/a6bWydgryoU/O7OhipGpJXGQ7uSxQEfxVxAXOgJMYj88ug7hrmwiHaDyIoC0z9wgQC X-Received: by 2002:a17:907:807:b0:a58:c551:4ed1 with SMTP id wv7-20020a170907080700b00a58c5514ed1mr3196068ejb.4.1714175576630; Fri, 26 Apr 2024 16:52:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714175576; cv=none; d=google.com; s=arc-20160816; b=e+ELmBp86gXmX2EUzeS2o6nflycpCx7jTrOhvdZvZEtdMWMM3+jqEJL0UTNA3mny/n rPU0q/EST/DDU0jCKP3zGWrOkUO/DqclbJHbJaIHNhL1g9YZiiE8qODCseiP3gDJ8RhQ S3keMZibN3UYaWJ0eubLjiVENh7DrsYO/eWPHHwjIoQpGPJvE+UaIGXToKfYmoagYTmk cITEnQbB6Giv9RRUfHZ+/3NsxYugZ+BafjdMHDR7syI5vbWjxLfhy37GHQ42IWUkyW6y BPr1Pcvnwf1qjbyiBprptOcIt3X84lAGFLfvQfkQLR8/RGua6uTJV/QbsJ2DYo29g7Wy qjrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=ZbLB8x7Vx1sdIsQer3DIRLbTw/JySTFMjBpOt+JV+3s=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=VM5SYOZZSZDLwcdUfc+d3OHwKHgwAjZHlPIzwlxIGdz+c/426X6LUoM4Yew8NF3U+l ikd1cxMC0kwNX6s99w1LTgi14AT7pJx79K0bNNBTtC8MFDUFD76qi4A6jgB63rEtWshH PtL9nLGKPJr+4rr7G9bJgeh7TUZ0K48iPJoJvLxAcXcvsI1UpSachvqAFhFAA4Eu4c4u VwJAWm0phif8Dx5Xn//v0y9ou7sbdQJdK2LnMsfdXS+GEx3Yj005xLBDlItyJBWcJBW+ OM3ojS33UohRVk9KHjyKQcQtlLECgurtA5UbZeR9HCdQG3E4FQGarSXyHoH+xTc3dbrw v3cw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=TiGd8+k5; 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 cw9-20020a170906c78900b00a58c567915bsi1533214ejb.417.2024.04.26.16.52.55; Fri, 26 Apr 2024 16:52:56 -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=@niedermayer.cc header.s=gm1 header.b=TiGd8+k5; 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 19A6968CD5C; Sat, 27 Apr 2024 02:52:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 D440B68D3D1 for ; Sat, 27 Apr 2024 02:52:15 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 37971C0003 for ; Fri, 26 Apr 2024 23:52:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1714175535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lqp6to+R0iYasQcTgEkOSB3lWMIScsBAm7jrgVaMkUE=; b=TiGd8+k5xs2IgIgKAIjUiqlZ4ssm86kxCQeaR2kSWkjb1qZtrDXFKcWES0IJF1aqVjlz0K UlKK7yE/NQ77RgT1Lce9iJaZDFgyph6qh1OlYQeTl0tOSV0RXU5jTUbCoseE0XdWrY6NFT CWP1nUtVnH06u2CXOZIJGn5pEliICNwGpJsgGRdHAE55hewPKE1NjiHfCMIOtRnbrR40VM tb9jPYDLpfYPlZMActnRaFc6jRGZtEP5FgLJo++mWtOgosYBDZfYn+Lb3UDTMG+MlEMh+P blbSb0pQVX8cgVEXZ4+U6hDW627SvL6BpYoTBBjIcwN02nUu8osvJKoqf03xFA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 27 Apr 2024 01:52:10 +0200 Message-ID: <20240426235211.3718252-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240426235211.3718252-1-michael@niedermayer.cc> References: <20240426235211.3718252-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 4/5] avcodec/hevcdec: Check ref frame 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: JfsjjxW91z5k Fixes: NULL pointer dereferences Fixes: 68197/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HEVC_fuzzer-6382538823106560 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/hevcdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index fcfb275f63a..92b0e45eee0 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -1969,13 +1969,13 @@ static void hls_prediction_unit(HEVCLocalContext *lc, int x0, int y0, if (current_mv.pred_flag & PF_L0) { ref0 = refPicList[0].ref[current_mv.ref_idx[0]]; - if (!ref0 || !ref0->frame->data[0]) + if (!ref0 || !ref0->frame || !ref0->frame->data[0]) return; hevc_await_progress(s, ref0, ¤t_mv.mv[0], y0, nPbH); } if (current_mv.pred_flag & PF_L1) { ref1 = refPicList[1].ref[current_mv.ref_idx[1]]; - if (!ref1 || !ref1->frame->data[0]) + if (!ref1 || !ref1->frame || !ref1->frame->data[0]) return; hevc_await_progress(s, ref1, ¤t_mv.mv[1], y0, nPbH); }