From patchwork Fri Apr 26 23:52:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 48280 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1509:b0:1a9:af23:56c1 with SMTP id nq9csp698156pzb; Fri, 26 Apr 2024 16:52:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVvIhdCZSZhF9ohSXHu0ETizpg4DE+sNV1iTvbtFM4eYY6uHPzavkHyY6uEPhU9BOkpGObCEaCUbN/LkAubiOAsO5alC5n4h5tyuQ== X-Google-Smtp-Source: AGHT+IF8GESpJ+JNQDU82nK9H+P3lA/yXa06OCXvLoNHT7qdxiAxrYDoI+C1RqykoouTElfTjMx+ X-Received: by 2002:aa7:c892:0:b0:56e:34e0:4699 with SMTP id p18-20020aa7c892000000b0056e34e04699mr2508619eds.30.1714175566828; Fri, 26 Apr 2024 16:52:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714175566; cv=none; d=google.com; s=arc-20160816; b=rdZ8O7+Ka6k482Sdj11xP1oFEKc9KsBqaBLQw6106FshTrw77X6qt0a3NRqdUxjOt2 wIdqMB6P8WCoL07Ti0iO3Hv9ZaLsmVS58aIwKbOuM6gJSNLaIa3XXKyipoYuW+assXkj coEoUn/ec9/j4ulys8HUidp1hSfq2bzLEZ/qcIItcCgQVdEx7PXQs0k0n5jakmQLS5yI +wgOHxwcXuLYm3FUoP0Fy0KmVysl/k1gAkNLer8ORPXL+QenWybBugQENVC2lmafd9CC +LEU0mdQj4ZKZt81fYOYsdP3sV1lPF8fREacB2JDiNvVa6w+9Wzcb5Vxs6vGQ4VcsFUT qZkA== 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=9QGEDcvrziyUP4xMNc9GLJhiwL3cQXbqx/REjx6ux+k=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=DS2VMRn4ljGL8aX7qLPwJruLnN8XiTXDWChX6WENKFMnRY/8ram0rwiDM0Jqy5n+5O rWUddjxB8EQcfZgxLzj9VnjbcfRR329bm2tyWruxCh9JefBR7bhiqphZzaVHNNWnOWOg /8TJmPq0cbcoZvlpcMh0TySTfdQbOwKa3tb1QmRVJaFjK75GEYL+mUEEkYk8R3Cphu1L bHx8ddDdSby78cpNNHfZNctUXviLeI0E3rufxPlD6m45qz2wa4oHg2qfX4EGXMvc42PV 20XFRW6c11LhIi+xGuadfB1f25gEsbNmCBNDxpLVJ+oaB+6U2/HuYRuiHqoRPjy/m5qb Lelw==; 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=gQPz+xFN; 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 q6-20020a056402518600b0056df9d6b14asi12469932edd.442.2024.04.26.16.52.46; Fri, 26 Apr 2024 16:52:46 -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=gQPz+xFN; 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 2A0EC68D17F; Sat, 27 Apr 2024 02:52:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E6B5768CD5C for ; Sat, 27 Apr 2024 02:52:14 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 2C02E1C0003 for ; Fri, 26 Apr 2024 23:52:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1714175534; 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=sTtT45sh7fncmcCB/C1WbGJskz5sYdZE1fhc86qdBg8=; b=gQPz+xFNUAbYL8U6vyUgvA3pjmcQhMqvyZAYTRl2WFS3cRYC68KPJF1un7Ydl/dAAkjerp RPoBNV9VP6/KfnMDmgnlVXhTfQJCnRudv5PCB3XVh3ljGv9buaIbbAExq2/g3MJRAi5t9E Bdilf5qtiQxk02UOfNzY8l9edGMEymdaaPIyFSgwUXvRS/kPTtm248O/32HqggCX0AYHuU dhJjLcQ0Y8kNkfSxetjcBzmcZ6U1KsIvsrAbSJRbhPWNyLnA9zbEUunsRNX4h7GjPVld+n sYEpMSkZQS9EP9FzOSivnQjewhyFwuw5p9JqCNW90RsJZo+jEIdKtkBQOtCxKQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 27 Apr 2024 01:52:09 +0200 Message-ID: <20240426235211.3718252-3-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 3/5] avcodec/decode: Check progress before dereferencing 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: vA7N1YGWgeDx Fixes: NULL pointer dereference Fixes: 68192/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VP8_fuzzer-6180311026171904 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/decode.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index d031b1ca176..a6131941f43 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1744,6 +1744,8 @@ void ff_progress_frame_report(ProgressFrame *f, int n) void ff_progress_frame_await(const ProgressFrame *f, int n) { + if (!f->progress) + return; ff_thread_progress_await(&f->progress->progress, n); }