From patchwork Sat Nov 5 20:16:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39180 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp1198645pzb; Sat, 5 Nov 2022 13:16:42 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6JLFiPBjg+rvmSOiIb8uvft4AvL7VgQMGAs4yPDdzJYt5+fDaZHt9u6s4n6QTSh8BMPCay X-Received: by 2002:a05:6402:4445:b0:461:b506:de51 with SMTP id o5-20020a056402444500b00461b506de51mr10667377edb.388.1667679402409; Sat, 05 Nov 2022 13:16:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667679402; cv=none; d=google.com; s=arc-20160816; b=WC62WHwNV6sZ6F9KiFN0w+o+JaqCC/YwAAfSWJpzsYoJMTSiaelU/S2WRk/FQt8GXD dF9vPnm4BI6jqUp9aoF6+0z2SF4EPIuDzCrgamPmt1UzH+NSKGwCjxgSXDf8MiGkGCY0 tmy2mWsxqRHAi9WllWHpf8RoQfwQlFuguh5tY1exIGqKYaKe9SBEv8DEY5WNU9IialOt MxFWvZFYWVSPX0yhqMN9UK9QEopRiCZUpPZVhW4Nws9r3vRH2/jw1arHmI4/UyUFAAld O88YVUNg9CpBUe2Kg8NChdu88+n9qHVH1LMNqOVEfq3fEwKSonrNpaPW7lYv0jXbYHiz +3Eg== 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:message-id:date:to:from:delivered-to; bh=imIoTbTOJge8nDNOggZEPHBDZfPYTH80hFHpefCmFNY=; b=xZrsCmJJXM3LZ/KSykJR7dRaCVHuIS/N1I3iUhm4sARtUyNRDiUnUaVQArWcc7QLhd IIDstdr7JRkn8KrKQbmznm5H5sw/rmsGrpARkysD56AZ30XpocPLlO1O6jiSz5UvJWdY mQd0RQTt6RxFIgIQmkSp3f8QT0yKrSrfcxesLeYN4apSvib9qjLL/4Rp746iw144LO+1 rFqpOy6kEg8sLAWfAUWj4l7ran7GeUH5Pgu/SYLry4kGd635433UUVM6Bdt8BrYV8c3s mig7WDjd2nZ6h9DTZVP6GgMyi3AdMdztq8+OWd++UCf4NIkpjOpq2KNNNThD+WZ0871L uAgg== 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 he13-20020a1709073d8d00b007826de24087si3542459ejc.228.2022.11.05.13.16.41; Sat, 05 Nov 2022 13:16:42 -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 DE28E68B0A6; Sat, 5 Nov 2022 22:16:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C982C68B0A6 for ; Sat, 5 Nov 2022 22:16:31 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id EDA0420009 for ; Sat, 5 Nov 2022 20:16:30 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 5 Nov 2022 21:16:26 +0100 Message-Id: <20221105201629.1980-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/dts2pts_bsf: Check ctx for NULL before 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: QW38kwMldxdA 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/dts2pts_bsf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/dts2pts_bsf.c b/libavcodec/dts2pts_bsf.c index bf20b1ec8a..8142562d2c 100644 --- a/libavcodec/dts2pts_bsf.c +++ b/libavcodec/dts2pts_bsf.c @@ -505,7 +505,8 @@ static void dts2pts_flush(AVBSFContext *ctx) s->root = NULL; ff_cbs_fragment_reset(&s->au); - ff_cbs_flush(s->cbc); + if (s->cbc) + ff_cbs_flush(s->cbc); } static void dts2pts_close(AVBSFContext *ctx)