From patchwork Tue May 2 15:38:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 41454 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp4092671pzb; Tue, 2 May 2023 08:38:51 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5T1cOf1MrP2RXdiOSL3bgTDaS6BUevodTEk8udp+sGbmpDCWFJJE/0w+8p7S5KSMjvl7ej X-Received: by 2002:aa7:d4d3:0:b0:506:b33c:70ac with SMTP id t19-20020aa7d4d3000000b00506b33c70acmr9116977edr.32.1683041930859; Tue, 02 May 2023 08:38:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683041930; cv=none; d=google.com; s=arc-20160816; b=Yii6OZcyWZzc4DSsbNJK56FGrBafq/EXqZpQFSua5Wleviknhm1UJDrNPGvP1ISALY r1EOf13nyBtJmXwCufETt25iYD69NHpQMADXxwQIugf1Hl8AzPto3NKD/V8j0SxETkHg i3m5ZiWdogjj0USwZRlf5o3yAN+ngnfFEt7UrhJXsE4ZrkkEWM6nkuy/FqN+mPaIGMUB TTiJjem3OMqne/J6ARZHkmygATAcq8fVtiwFYShXNlLWEdkHZNQN3Mp21kQi6g2BdTkH spbgD5jA3K/G43nAWCnjbjZBbIN9PviYe0VOBUEzKzcA0HQMIz4d5WWlIVGnkhtPEigz SPIg== 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=eRAfw8WMCoG6IHvNcRIWjO4JaQNH+b8LrG4DjLHNcO0=; b=brC7jflNGq4bmcFg36elxeoBJ2+65Nkb8/DGchXtgr+T/ytY330vKB/KVWczomZhcB TFgMJ/UgBzB5721ujM9mI/WByzEasXG86wLM+5tNjiZhDaS0zAToZL/3jQpOuqKM4xF4 n6srqKDD7KB0rPEaP87p4419cFbFeKmyNXyOlH8nmKF/z0kV7p+c+7yfOoq02yvSqBki H7H++rWij1c8/WawzLqFUuuQZZ+KEUvS6KIQmGqBotSP7CcSPt3aSO6DGZ95+02WdcMS yNqr3R/VN4zZgaQpj57mDJCzhBlKmmvpuJUXY1ae9hJr9L8O/laq/9pPQ93nf268jppe h+eA== 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 o24-20020aa7c518000000b0050bcefece8bsi2004293edq.217.2023.05.02.08.38.46; Tue, 02 May 2023 08:38:50 -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 29ADC68C166; Tue, 2 May 2023 18:38:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay11.mail.gandi.net (relay11.mail.gandi.net [217.70.178.231]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9DF8768C17B for ; Tue, 2 May 2023 18:38:23 +0300 (EEST) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id D698B10000C for ; Tue, 2 May 2023 15:38:22 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 2 May 2023 17:38:20 +0200 Message-Id: <20230502153820.32234-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230502153820.32234-1-michael@niedermayer.cc> References: <20230502153820.32234-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/pdvdec: Check previous frame before using it 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: 5oSPunTfsZzK Fixes: load of null pointer of type 'uint8_t' (aka 'unsigned char') Fixes: 58256/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PDV_fuzzer-4776436325285888 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/pdvdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/pdvdec.c b/libavcodec/pdvdec.c index b1fc19b1c9..605af78050 100644 --- a/libavcodec/pdvdec.c +++ b/libavcodec/pdvdec.c @@ -93,7 +93,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, return AVERROR_INVALIDDATA; } - if (!(avpkt->flags & AV_PKT_FLAG_KEY)) { + if (prev && !(avpkt->flags & AV_PKT_FLAG_KEY)) { for (int j = 0; j < (avctx->width + 7) >> 3; j++) dst[j] ^= prev[j]; prev += prev_frame->linesize[0];