From patchwork Fri Apr 26 23:52:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 48278 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1509:b0:1a9:af23:56c1 with SMTP id nq9csp698038pzb; Fri, 26 Apr 2024 16:52:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVKA3TWEjVOFk85bSJ6bmSR951tAA7qonhUr92Oik815foebMmZA6VogGqF3nuTfUUKepNr2ant0XJ++U/XPp0m6RSGVNycdKCSiw== X-Google-Smtp-Source: AGHT+IFShuU+oGsLzxGrfQ/oYP/YuTssHHtKhYMeoeOmVmRR0woW7TKXo3hU7SYu1WEWFR3m4C3N X-Received: by 2002:a05:6402:5309:b0:572:65f7:eed0 with SMTP id eo9-20020a056402530900b0057265f7eed0mr1080580edb.0.1714175545758; Fri, 26 Apr 2024 16:52:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714175545; cv=none; d=google.com; s=arc-20160816; b=lyMiDjkhqzI2Xka3v14qyNEy5I4qjDa99QNl7DUOm0oVmZWV3jhzOL+c1Kj2pj10kz slBtpNgUUap/AvGyLw1U/NvR6Bp/+bZVpvtQx4Xp7jKorRy26l0aJzlXgKygOWZlkvZu 3+VoJD7BGpUmR3J1U6UjtXgQa2k+h6FzjH9utJ2OA4rrVJ75z6jsyNXX2ndB6X6L8Del LCUzFps8AAE/F5vDQcGPwU9ghQRjAymUaqdOn4dVQVd9GT62VULbKvrSXN5ShuI40MPR LuHZFx1rj6Zq1thEOB6h9yk23Fb9ZprSZQxORjVsZaSR9NmC+egpvWKb3be+eTg0v/3j Jkwg== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=n4OAMWEfkhU/IKsZdMLpIkFSFzBn0P1Xk1zTLUccjNg=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=eX23mASQJEztXOjVpZWlw6Zaq8XNsmFyJaRNnqFnS+L91bSBmCqujL3bXhLrBdeRAa 3m6dlIO6veIyOyMKx1MDcP93UFbVrP4EDUOcddlGNZ9VFpQiWfo/2t0Z6NYd5Ww9/l8m YqmgKzPRp0AQEM7yxZFpnPGOtn2Udc/xkI/U7p0VoXMimEori/H4f2dEyZYaFi2667Xm pThirAQ/aFyUeTNMXAVg1HyBwC2AItyHX/dHRWOLzusg0ZXTnCszIbyY8ObAxSV8WRjz 8m2G+wwhpNQZGPtnolH3mm+R04i9oM6+yxNDTgff/DFdHChWr2tD8HR5CiHwRYP0akvr N87Q==; 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=KuXBs5Nu; 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 s16-20020a50d490000000b0057247cf575esi1877488edi.611.2024.04.26.16.52.25; Fri, 26 Apr 2024 16:52:25 -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=KuXBs5Nu; 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 7D32968CF47; Sat, 27 Apr 2024 02:52:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 20FA968CD5C for ; Sat, 27 Apr 2024 02:52:12 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 0DBCC240002 for ; Fri, 26 Apr 2024 23:52:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1714175532; 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; bh=0WeOXuYYwuPsVnrFPhZ8CZGNTwRpF/98Bqxkmax47xA=; b=KuXBs5NuHMSzGXlgSKpE0Lt4RWOwdOwRiuCxvsvpaQQ6lnJOlh/3Tla3H5TdPN14vmDpA+ b3ql6lWPMIwap/r2+8u5DLDSVqXeMcZWGNeynSB3uP8zY16c76u9JkU1uS3K2xImD1QSCu Sq6WbnsSUhsbAt3jGHvhXHkTF+rt9x2itLelp8v8V/56SUh51IlaxNDss68mTIs8a0XgZN nxO1GchaRrGNVe/aqyAErXBNUOAqaOGjxrVZcnyunZ4lWkx4mkyOxxYs7auMtIgpvrdGPs ImfSxHbi7aG9tW5EKFYrIrGZ0qEDhVrYUYAuw1acThc+RXmzy60Cq+vYCPCoFw== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 27 Apr 2024 01:52:07 +0200 Message-ID: <20240426235211.3718252-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.43.2 MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/5] avcodec/pngdec: Check last AVFrame before deref 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: Rn+rz9qy8JYX Fixes: NULL pointer dereference Fixes: 68184/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APNG_fuzzer-4926478069334016 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/pngdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index f7751223b81..b24bfa248dc 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -1218,7 +1218,7 @@ static int decode_fctl_chunk(AVCodecContext *avctx, PNGDecContext *s, return AVERROR_INVALIDDATA; } - if ((sequence_number == 0 || !s->last_picture.f->data[0]) && + if ((sequence_number == 0 || !s->last_picture.f || !s->last_picture.f->data[0]) && dispose_op == APNG_DISPOSE_OP_PREVIOUS) { // No previous frame to revert to for the first frame // Spec says to just treat it as a APNG_DISPOSE_OP_BACKGROUND