From patchwork Sun May 16 19:39:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27792 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2232879iof; Sun, 16 May 2021 12:40:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyUWkXMX62NPtOTQR4XqAOesJFrSGaunIuyZILajUbJaF9Lc4+e9fEfxQ5FMwwHjdVVb1o7 X-Received: by 2002:a17:906:e09:: with SMTP id l9mr5503903eji.528.1621194030066; Sun, 16 May 2021 12:40:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621194030; cv=none; d=google.com; s=arc-20160816; b=ymm3SVw9WRP2MIJYnzPdBxUnvpd7zlWCXUOPRaNJ2sppZ0YTlfu2cCGAXhX0qpej52 XvXcAhyEFWs4bT+jadihvGBEFB+P83gzEswRmxFr517oRcqafnUcEYtXq17r8+OKPy36 1Pnjt0ODAQ/kYaeYUW2aFk+hjKGNGWn+1WdouvpqAZrxYSIk/PlsUPBNC/2/h+Iw6VE2 N/r0pozEM+a/qj8jCNuih3YV+b+7x9FNb+ycbDZJok6fd4NdkAOKBcmXskPya2MOnSj2 /Mj/D3AHbE7hR45aQUwZmnf5EsCdjgjEDUShPftIGYyxoy/cOfmcxhUj49xjOfin4HeH 9Gjw== 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=iJfwIWcyh18QZAS0SRPxpu5sniPkrZe8tn5JS2zZGYY=; b=LU+vY64gAoAt3c7vW/hGvhSE66gmbpK3QmgFz4uUoII64Hy8K01rbHZ12M/CU26Qhs Alobj4EBQ7zGKiiN/X3rK6NOc67XS44rKKBAKDk6YZFOkCRtvutReF5hMEXfKJZXle/L cmgIyKcq+VJhZynHwYndEAlMUsd0yWiYyxHxbUA7e5AMZQKTw/ay584OImVYBSieZ1HH lKF78ayOsRDS/PDb5Kds1EbFBRe7Lfk5gTSlG4VPBgE2Xw4cLywnGR10XCF828bXvwno 8vQ+zBWKrhHiN7CL1kucp1XCpAm/3jNq3WwEgOHCRlC+q3VWW8grMj/pdb3Lf361tDTL d0AQ== 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 s3si4810342ejx.462.2021.05.16.12.40.29; Sun, 16 May 2021 12:40:30 -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 CA36968979B; Sun, 16 May 2021 22:40:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-1.mx.upcmail.net (vie01a-dmta-pe01-1.mx.upcmail.net [62.179.121.154]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 76AA468804B for ; Sun, 16 May 2021 22:40:02 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1liMcM-008hpn-0C for ffmpeg-devel@ffmpeg.org; Sun, 16 May 2021 21:40:02 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id iMbOl8pfhljeHiMbOlMDzr; Sun, 16 May 2021 21:39:02 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=LgM8dMddOirLtSYyuTEA:9 a=pHzHmUro8NiASowvMSCR:22 a=Ew2E2A-JSTLzCXPT_086:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 16 May 2021 21:39:01 +0200 Message-Id: <20210516193901.30853-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210516193901.30853-1-michael@niedermayer.cc> References: <20210516193901.30853-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfAbHLxWKs3SDBMnWmq98ybWTAcZcLNGlEOvkBnwQsky5rrzHdTLNGvt4wbSZanVgoy0z8AY80BGAkag/PyJgDvD/LAzAevEAbTSeDjpAhqRcTdS2hg+d 6ESO8+jwP3wKOfvZN3c//qL2QSG15sbuMCMiSRGs727175ic1Bb93uck Subject: [FFmpeg-devel] [PATCH 3/3] avformat/fifo: check for flushed packets and timeshift 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: oQXkG+iSGbEG Fixes: CID1464151 Dereference after null check Signed-off-by: Michael Niedermayer --- libavformat/fifo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/fifo.c b/libavformat/fifo.c index 620fffa032..50656f78b7 100644 --- a/libavformat/fifo.c +++ b/libavformat/fifo.c @@ -593,7 +593,7 @@ static int fifo_write_packet(AVFormatContext *avf, AVPacket *pkt) goto fail; } - if (fifo->timeshift && pkt->dts != AV_NOPTS_VALUE) + if (fifo->timeshift && pkt && pkt->dts != AV_NOPTS_VALUE) atomic_fetch_add_explicit(&fifo->queue_duration, next_duration(avf, pkt, &fifo->last_sent_dts), memory_order_relaxed); return ret;