From patchwork Thu Jun 1 22:26:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 41940 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51c:b0:10c:5e6f:955f with SMTP id gm28csp803278pzb; Thu, 1 Jun 2023 15:26:23 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5253uWOyX4QrWeCc0Fk+mTwmFmoXoQP7iOt9i7pS/HIKLJnTHWWdMDto0frk/NRIhrXt0b X-Received: by 2002:a17:907:d13:b0:96f:8d00:43be with SMTP id gn19-20020a1709070d1300b0096f8d0043bemr2726170ejc.0.1685658383307; Thu, 01 Jun 2023 15:26:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685658383; cv=none; d=google.com; s=arc-20160816; b=WDH68uANVJA7qZ7XXmsRCR9Q6z/1VP23N5EdHgxMKv9XJ5DbqxCcr42hIfFer39X5Y g3ynFD2g13+p6ViKkgvcvv8DMDsE7I6eTQZZLZwk+nPHRbPoq03/oGQPdHRsdQG4wKU9 Uyvd9nTXjWaANFhsb2rKI3eF7T0qQnW0z+OzcknlF1ZRGL8IjGitDJxf948CuUQZzuIw /PdD2tXl/WbRor0giBnr2dGf8YQp2iXXMWzIJuPXcACGKUlnizAKHuOJtMJmnhMs35ZA U9/k6cJMGPyZ/0ZMUPlOuWRrd0bpQPekUlpeg4ATnXyiXJ/2VrwrOSb5CGg2HAs743rY X5Og== 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=IUU9B5Fhm8Ai7d4V4r9fRGynsXk1aFStgq+gfikzrZQ=; b=kXhs/LcBeULVjCCo6pDrSgKk4dz5Zcl7ftFUNbBeCLQAbkQjdiyDE9nhA9M5SykjBh 54/E4q6KxRd+hpordZ0gTuWmPq4ztLeZnB5Bpkot9axDPYF4zNmyBifEscbJsfDF0LTa o+aca4NQuG/ytdehLjCOo19EHkMO10/9oZee3LqjQ8qaUgRsnA8DmhX8Cv+JnlrrThfV WGPqO6iN2WBQbCTjWSoQp35Qrbc0tNzgkkswK1y2BaJrn7QKZ6Wq4WtNjP7EochBpBsU DPVqhUXKM/7srQ6q3ig49Made3e6yUOF3K57QS3I1yCwDFusKi9rYUzozsTaOV1iqQZb Qj4g== 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 y16-20020a1709064b1000b009745e0b222bsi269445eju.976.2023.06.01.15.26.22; Thu, 01 Jun 2023 15:26:23 -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 6693D68C2D3; Fri, 2 Jun 2023 01:26:11 +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 01C9768BED3 for ; Fri, 2 Jun 2023 01:26:03 +0300 (EEST) X-GND-Sasl: michael@niedermayer.cc Received: by mail.gandi.net (Postfix) with ESMTPSA id 3BD3CC0003 for ; Thu, 1 Jun 2023 22:26:02 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 2 Jun 2023 00:26:00 +0200 Message-Id: <20230601222601.12631-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230601222601.12631-1-michael@niedermayer.cc> References: <20230601222601.12631-1-michael@niedermayer.cc> X-Spam-Flag: yes X-Spam-Level: ******************** X-GND-Spam-Score: 300 X-GND-Status: SPAM Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/cbs_av1: Clear obu.metadata on error 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: NIrQcMG9ElFT On error pointers can be left NULL while code later assumes these not to be NULL Fixes: NULL pointer dereference Fixes: 59359/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AV1_fuzzer-6726080594313216 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/cbs_av1.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c index 8788fee099..7f3f4da2f5 100644 --- a/libavcodec/cbs_av1.c +++ b/libavcodec/cbs_av1.c @@ -1013,8 +1013,10 @@ static int cbs_av1_read_unit(CodedBitstreamContext *ctx, case AV1_OBU_METADATA: { err = cbs_av1_read_metadata_obu(ctx, &gbc, &obu->obu.metadata); - if (err < 0) + if (err < 0) { + memset(&obu->obu.metadata, 0, sizeof(obu->obu.metadata)); return err; + } } break; case AV1_OBU_PADDING: