From patchwork Mon Mar 21 20:19:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34880 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:ed11:0:0:0:0 with SMTP id hi17csp1960186nkc; Mon, 21 Mar 2022 13:20:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz+flxOGda4YsIZ2KeKw+E6Yq9lTw0A29Sq+m8jthL1fdlYxXjgDMExRszYoXUsUrTRTOv9 X-Received: by 2002:a05:6402:17dc:b0:418:efa5:f445 with SMTP id s28-20020a05640217dc00b00418efa5f445mr24768547edy.125.1647894025034; Mon, 21 Mar 2022 13:20:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647894025; cv=none; d=google.com; s=arc-20160816; b=XR5b0agwGtpGLYYB/3ebSmqUhOxuCeb3lu1g7yG5EUL3zWv2LJ5nK/1awHU5M9xPZV GTKP/BytxKOGQ3KTwezYs513vcnbDvwDdx6Sx8PEuj9yVGAaKXjuTWBVmwIZ9aJWX5N5 EM2Fet1/0mNqj52+6ylZG6c7Q5tFuLQjx0qg9u65K6QPH4ql8ChNBOg5qm5/4DL6f09C UJYevP7zFyAgjfd+k0AtARNb5BtXwf9wNmJJU1fJu5Pv7UZr3mUoLbFbKI5X9mnxHAqe TLQzHV8L0Ei+NRsDAczKA3uUjgdekLWoVIxo/UYH9fD718uZKK2F/CvN4zDkiIQzMBwT 8l6w== 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=QiXR9vQeaPD8FFyeltWqs/1TmP7iUWNvRkEcrkt8XPM=; b=orIBDtGYRxzTClVl3cijIjhSpn4J8Soe0oPeqHcD/BmbKjC0h05vDFdFXaI80QcDfm VJLIXHIPA3IibXyRkr/KdGuj34l+qN3uEdATYjjpLBqWccPajEy+7XoWtVr+45fms37T gcNMZXTufhmau1ZecK7NDHGYZ7Jhk/LjlCeym3ZdXqG//lkNzhvGx1j03A+B054aTnsS YCgiuOod8x7E/O/trN7Q1q24cpAS7yxwtwn1MbiE0VtbT3Aij/StH0VivtbgQ8sMj0IV wQDqpZPCrD9g2ttEBJLXGrK6KKjVSt7OFeQTHXRg9MCU7pdrJ872am1F+zI/YLnXVHLz +6jw== 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 z16-20020a5096d0000000b00418c2b5be5bsi9859915eda.317.2022.03.21.13.20.24; Mon, 21 Mar 2022 13:20: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; 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 4140D68B10B; Mon, 21 Mar 2022 22:20:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-3.mx.upcmail.net (vie01a-dmta-at01-3.mx.upcmail.net [62.179.121.147]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 42993689A52 for ; Mon, 21 Mar 2022 22:20:04 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nWOVX-00Ghof-1S for ffmpeg-devel@ffmpeg.org; Mon, 21 Mar 2022 21:20:03 +0100 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id WOQ6ncaEHSgGFWOVXnNATX; Mon, 21 Mar 2022 21:20:03 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id WOVHnj3RT8eSWWOVHnxfxe; Mon, 21 Mar 2022 21:19:47 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=KKE5sHJo c=1 sm=1 tr=0 ts=6238ddf2 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=HOdrBnsEXgKSFJCnHRwA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 21 Mar 2022 21:19:43 +0100 Message-Id: <20220321201946.16919-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220321201946.16919-1-michael@niedermayer.cc> References: <20220321201946.16919-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfCF7ZIuDnYhNjfe8+kUVouNuhGfFHYi4yhfjRwYCTiIcpNdzsbSfpV6k7yhwhXvj9FtRi7iUMbKPp04iN+o89iKHEKhM+ZNQip0bMVdI1+p3CH9D1S+f bubOAPRu9H+NJmYGLh2Bd7AEaG7EeUx4yL3IsAhSF4BMluUFSWuo/2wAU84RkWXbdTFc1DFWdC2Czw== Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/allcodecs: Dont play with NULLs 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: TUb3VtVvkBzR Fixes: member access within null pointer of type 'const FFCodec' (aka 'const struct FFCodec') Fixes: 45726/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-6554445419249664 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/allcodecs.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index b1aa7e266b..22d56760ec 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -882,10 +882,11 @@ const AVCodec *av_codec_iterate(void **opaque) ff_thread_once(&av_codec_static_init, av_codec_init_static); - if (c) + if (c) { *opaque = (void*)(i + 1); - - return &c->p; + return &c->p; + } + return NULL; } static enum AVCodecID remap_deprecated_codec_id(enum AVCodecID id)