From patchwork Sun Jun 23 23:01:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50106 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1696496vqz; Sun, 23 Jun 2024 16:12:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVcBzWfJz3E+TvviDyIymyPev1yzWuTkzO1hsjKCcKrc6FrgY7hsSWjTpUOXycu3NxgJWHqw5pp6taOn3VOzCj7NEXoQ2NfG0BVrA== X-Google-Smtp-Source: AGHT+IEd1XJmY9K3935tk0cDyxkTDErhsk6XJun2c5X1XFS5pnW0xWJTOXmFsquNZlHlP5EyTJoX X-Received: by 2002:a17:906:2596:b0:a6f:d107:7309 with SMTP id a640c23a62f3a-a700e7316b8mr290761766b.37.1719184365949; Sun, 23 Jun 2024 16:12:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719184365; cv=none; d=google.com; s=arc-20160816; b=f5U10+aSxZZditkikiG6z4EUq1CA9AjMsbDslYEf0esvysIL4BzhlrVLqVuHx6z5A4 jCBcOpeAABy1Ln7gJRbFDeEgSv/bbxt//P0w0LMgdkSY2QUkTha+/UBHo2aX6VfyRu9z stvaQPTI/S/uxozjf6HpzxbeECFvOr74+SfRNQhB3ccFpiiNiBeCQchthu+ZIVsCXu5P DuKmzhG82I/f1x9pMoIr4d0sMS01/gbI7PbMJexVXLeRDz4jHlpm3B8CjAEU4fBv/IUm Kduws/dQl/udj0MWda4767w6WmNQRtJl4sdVTAiE/KTjWpbOynw9CIhR2zEV3HCNtmjd UdtQ== 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=ouRzqw8ODKfB9ZyiuhHX5aP5Tnm6IMBVI420Bju2Axk=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=yO2oRwJ/4WKmykQ6Cs5MiGmHbbSpWK1tBpFIupvlk+8NX8J9eIBYXgsugGHIj6RrkH +U56nOke3rEJ06cviND44B9SM+TkxUUp+jHXVp49N5JZ0fmO9Yov0SHPHs6KOevC7vs+ +MfyiyUC7IGdr5xIoSdVC1IvYwFcP+fqgLgZGy/VTDMzFh5yopOhsYPdkyQ6NtVsjewI QlOmVsXJFOBJYK2Vll0nYqsw4vWJGoVjVEPR/QkcE+jHMvHkzYB5YZRJN8W/8X5Ph2eU eU6axJQVmfIuckE7zoBaX7elztfRoujwHqnMSfGkHrlULuVVYQz0DK7QVWjcT3poGiie QUEw==; 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=SwfeLiTE; 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 4fb4d7f45d1cf-57d306b60f1si3030804a12.285.2024.06.23.16.12.45; Sun, 23 Jun 2024 16:12:45 -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=SwfeLiTE; 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 22DB368D63B; Mon, 24 Jun 2024 02:01:49 +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 A306368CF50 for ; Mon, 24 Jun 2024 02:01:41 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 095C3C0004 for ; Sun, 23 Jun 2024 23:01:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1719183701; 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=dswMyev+Mz45bCxwL5GP9aGoSDpp0kCMVy2fVpNeBgg=; b=SwfeLiTEXJpP4vO4eZhA32SfxJUNgAp2W58Wc4aIF3rupB2op0BACL+OJg4IdnvS5uMRVg 5+0Y/jVpu/bAJEQr+oosYHDFoDHgyWpC6HqFEdDIQubB/e378gOa+5iZbGyp7WuXqTS37O h7ftS2I7oz49f19Of0d0rUJ65z9TQom3rYs1Vu5hSKx31cZKW+e48b/ndSZ4gK7eKd4zBE zSbqe0qSl/Tn1vyjUW/D1nucPe6baRuw4BTjF+d7dHm2Q8nJXpsMVOtMFrSlizV/w22X6g 3JgUmxCn18GM5oxqsdQT014PNtkNst+/c3bbb2Q1v4oXQd4M53YStQsCqysE7w== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 24 Jun 2024 01:01:35 +0200 Message-ID: <20240623230137.1749178-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240623230137.1749178-1-michael@niedermayer.cc> References: <20240623230137.1749178-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 3/5] avcodec/hevc/hevcdec: SPS not set (or cleared) after frame start 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: bF0QnplH4oFH Fixes: NULL pointer dereference Fixes: 69623/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HEVC_fuzzer-6549698459009024 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/hevc/hevcdec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c index d68d454537a..4dd84d4953c 100644 --- a/libavcodec/hevc/hevcdec.c +++ b/libavcodec/hevc/hevcdec.c @@ -3180,6 +3180,9 @@ static int decode_slice(HEVCContext *s, const H2645NAL *nal, GetBitContext *gb) } else if (!s->cur_frame) { av_log(s->avctx, AV_LOG_ERROR, "First slice in a frame missing.\n"); return AVERROR_INVALIDDATA; + } else if (!s->ps.sps) { + av_log(s->avctx, AV_LOG_ERROR, "sps not set in slice.\n"); + return AVERROR_INVALIDDATA; } if (s->nal_unit_type != s->first_nal_type) {