From patchwork Wed Oct 2 08:28:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 51985 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cb8a:0:b0:48e:c0f8:d0de with SMTP id d10csp797554vqv; Wed, 2 Oct 2024 01:29:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVJgk5BvhWm27Kt7CxLTQ3h4tjzphCcEnGuqaPQRwippXWaeVNN/Z3RGfXx0XsWtbUg7Fs16YIFrtOM/S4zM2nS@gmail.com X-Google-Smtp-Source: AGHT+IG7yzMDRWERRfxxx2G+fDLBUS9vYomNahg8HSP0J9CS2fsSkpt+Ka3/gFIeJ7eEcoofO4yA X-Received: by 2002:a17:907:60ce:b0:a8a:780f:4faf with SMTP id a640c23a62f3a-a98f834d1e1mr196166966b.47.1727857740322; Wed, 02 Oct 2024 01:29:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727857740; cv=none; d=google.com; s=arc-20240605; b=MlV2n4a+xdgEdSIL2wuw8LPerNgQDU4aANYECuqX6SeuOe4qu6Ts00pCs+eU/445+x 2w+UQnQlkxW4FeZQyIGD2nzwhlgBm93I+j71LN9JRGoY5bmV4781FTsAkDJsamWxWrIo iObsPuxlJ1SDLg/PFGiZiKKE2mWM1UQ6pA1Zak/uBGTclNm97UOj97wf/7WERSNyARS5 mS3VwnUaaM0yx/5VRw6vxYGW0jpUmDSg2M9dPz4c2P+mEMxFqi75ZhXyYb3XaQRAN3YJ 7FDxgNUEPZU3Dn565TFEmjym+ZM1sonJKNbT4fxnkDaqLAAAtcLS9ERLojbqELL1fUBp 6H/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:cc: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=9GJHi6qGRGy2EzHcys7mcV3tUYcAY0fKHvK5oCelLHk=; fh=5uxKdrNQ8cmRHeJPb9bXYoY73jE4S4LVNIp32MQ+QbQ=; b=O2rGa/oZ+V1nuUucvIK+ytQ2cHp4dNVLrCQKCW0kJkLczd4tkrKlE8UJ1yT8afMDjT sh1/YuFxUTP6IEiwV7ZYlk2mPfKVjKpjEGmf1vW3Ag9XLMrZJKbXFNbbiP2YV4cnwkGq NdueJYHv6INa1mYPa8sPiMRIoc81WDkFTwfa2cRaG5/ImTPjWZhKStDA0R5o1ixa7IzH HEPLFQlL5NWVfc3nEOfehKeF6vRPJnjZ15OveeQ0beyqqKjjogpGuenFovW8bHH4MRMi sMypjXVjy4m5QHs+5P1iZWmct/G56Z/JwCh8UIafurQc2Pva0leTpYiOpYRWGtg6MnHm Bogg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20230601.gappssmtp.com header.s=20230601 header.b=dwh4F5Hn; 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; 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-a93c29b32efsi867036766b.388.2024.10.02.01.28.59; Wed, 02 Oct 2024 01:29:00 -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=@martin-st.20230601.gappssmtp.com header.s=20230601 header.b=dwh4F5Hn; 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; 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 623AE68D8FF; Wed, 2 Oct 2024 11:28:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 71EC968D8FF for ; Wed, 2 Oct 2024 11:28:50 +0300 (EEST) Received: by mail-lf1-f50.google.com with SMTP id 2adb3069b0e04-5366fd6fdf1so7838145e87.0 for ; Wed, 02 Oct 2024 01:28:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20230601.gappssmtp.com; s=20230601; t=1727857729; x=1728462529; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=LN/fEDBPq22WLh9XL8mUVcOdUvgI5HBvABJY976i8OE=; b=dwh4F5HnJPGMwZM/fg3BV1syTEgphs7tc97Ti35nzbhVYcBSYD7Y4MgVqtS+lteklb OXhfANMRsfmN4qWieHE0ooHhNmxTruzEfYuy41Z1cSWiS/fxmCTE03T0odtdKGq4h32u F3hIPzKNV6jxHzcJm6OqEJwtbhiUW8woh7/UzznDOB0Aktz4nHemg+YLIsaYY7F/oIFc aTTFEU28B2yhpXE7uZnrEG7xb5VvvwYqymOLR1U+8BX9XiG+lotJiiILO+0Bdls8zirt ihyT6vUsPwo0m+WO1l4aVhzfa2wOBxftimcxFyYsFfTF/WT746qcEFEkHqJtWxY05ZwU 0ucw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727857729; x=1728462529; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=LN/fEDBPq22WLh9XL8mUVcOdUvgI5HBvABJY976i8OE=; b=UVvIqxYZ07RBS4vArD1cFME2o/xJrrggYhxYvGJtAGSTxI1yUno2aSnJOY14ScsP3H Xrd0qMi3xDmly6CalscnOCujkNJXgkyHIrREhlRICjKxoet5LcGQFQJ1aWulf9u/j06h OMPbUU0Ep0Je+PVxi5LbRRhixmSQb4+WHP131WoC9Gm5QdB0dYlksn16Px/5M3+0cKUz cXNWI2Su205zOrkawyhNpO0MLTWffY/ghV1/OutikcBKtFYg8mqZwXOjkio8AlRXM7i3 NIDgYg5EAPawCQabC53QBdFRCV5/7kJcJAvnI7GjSkNP5xY7dEmvQtzWVD9pt/iSDK0k IWgA== X-Gm-Message-State: AOJu0Yyvk7Nob/GE4YvlegZYYcp09klZfZb3Kx+w6vsyi/k+HxIJjrtP wCuNUeVKil3SRayo6jMwnv0bcULZcSF4xN0Qep3gFuzU6JWqWIkoDApETsEqToZImyrE3RgxFCr iCg== X-Received: by 2002:a05:6512:3d93:b0:52f:d0f0:e37e with SMTP id 2adb3069b0e04-539a0793f03mr1207635e87.42.1727857729329; Wed, 02 Oct 2024 01:28:49 -0700 (PDT) Received: from localhost (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-538a045c701sm1847781e87.304.2024.10.02.01.28.48 (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 02 Oct 2024 01:28:49 -0700 (PDT) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Oct 2024 11:28:48 +0300 Message-Id: <20241002082848.73792-1-martin@martin.st> X-Mailer: git-send-email 2.39.5 (Apple Git-154) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] av1dec: Don't crash if decoding of some frames have failed 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: James Almer Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 9oRmRaaAwNUd If decoding with hwaccel, but decoding fails, these pointers are null at this point. --- libavcodec/av1dec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index 6a9de07d16..bc4ef63e68 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -281,6 +281,8 @@ static void skip_mode_params(AV1DecContext *s) forward_idx = -1; backward_idx = -1; for (i = 0; i < AV1_REFS_PER_FRAME; i++) { + if (!s->ref[header->ref_frame_idx[i]].raw_frame_header) + return; ref_hint = s->ref[header->ref_frame_idx[i]].raw_frame_header->order_hint; dist = get_relative_dist(seq, ref_hint, header->order_hint); if (dist < 0) {