From patchwork Sat Oct 29 19:13:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39046 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8e01:b0:a3:a294:714c with SMTP id y1csp31596pzj; Sat, 29 Oct 2022 12:14:17 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6Q5Rd+Qr2b2C9Yx20wX5VhkNvyBnp7gGuIrQxiS678zXi7VUTlNer4+SbkJMjCWy03vyZQ X-Received: by 2002:a05:6402:3596:b0:462:6b69:873a with SMTP id y22-20020a056402359600b004626b69873amr5579720edc.374.1667070857678; Sat, 29 Oct 2022 12:14:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667070857; cv=none; d=google.com; s=arc-20160816; b=u/x2IasS7/Ly2kU+nhcRGfkAFvHMSWSAsriMaahCfKv3vXk1HbjZ8QQrTxZu4KUDSh 5TDrko+ayd1jxSxnzMdoLTaHvcJxXG7G15xKf4s5TMT3Hxg+A4PVT1xKZ9TAOtlUiQVB r7Jq90xnkmfBj44FR0n1gJCpHPG6V0J9Yh/6uaWbXHMmJIBODUZK1o/QQhv4XdvLVw1Y xVTa27B1Ob6Ts341IifgtcEb4iLzv5K+Gar3zqdGsBYgF7ZXgy8rbH/BMwleEXeZUuKq F0Pe4W4OMNJk+SYuctUKue6jVicuyhnuYJjAm53NsGr57ldCoJ5TB0Vu2sHyaBksWQm0 e3PQ== 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=D4hKkPkzlPHMQrsK9tro+KdSf45E1gl/xLeixd+hDRk=; b=cdR98KUEjvHelS5DXkrBvoPyrxVBnmT4aOq1+X483GUyzWF7RTO8S1efjd2pegTOqt G+uJzIaX8DlZX/2Ne2RkFCMRpwn54/hfgb/gF/M7f97R2uaY3NPzlX0MD29LRggLZ6S4 7EMZLeclN2/MV2hQ3A/ao/nOFnpbpYzripTL2lGLNg2QKfZowiTPYddsp9VD/j+K+Png +qiPPPPkVX0iywtOxCpMUeyuA4mgrmnIuSSFbjfhyQZ9IsvgWrkBNDOa+x6ECDvnns7v Axm6MPQ4mHLMFqgwWQWrNOzgNhJ64mk+8ey79MxAfPXY9N5paK8YjHWIowDj/Z2h1jIy 3oPA== 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 hd37-20020a17090796a500b0078d44c5da0esi2467183ejc.667.2022.10.29.12.14.17; Sat, 29 Oct 2022 12:14:17 -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 AF5F168BCEA; Sat, 29 Oct 2022 22:14:07 +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 33FF668BCB6 for ; Sat, 29 Oct 2022 22:14:01 +0300 (EEST) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 7F737240005 for ; Sat, 29 Oct 2022 19:13:57 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 29 Oct 2022 21:13:51 +0200 Message-Id: <20221029191353.2973-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221029191353.2973-1-michael@niedermayer.cc> References: <20221029191353.2973-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/cbs: Check ctx for NULL in ff_cbs_flush() 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: pA/uWsSUcPfS Fixes: null pointer dereference Fixes: 52155/clusterfuzz-testcase-minimized-ffmpeg_BSF_DTS2PTS_fuzzer-5760107527143424 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/cbs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/cbs.c b/libavcodec/cbs.c index 504197e06d..9d59403f13 100644 --- a/libavcodec/cbs.c +++ b/libavcodec/cbs.c @@ -120,7 +120,7 @@ av_cold int ff_cbs_init(CodedBitstreamContext **ctx_ptr, av_cold void ff_cbs_flush(CodedBitstreamContext *ctx) { - if (ctx->codec->flush) + if (ctx && ctx->codec->flush) ctx->codec->flush(ctx); }