From patchwork Thu Mar 2 08:53:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wm4 X-Patchwork-Id: 2727 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.31.14 with SMTP id f14csp153643vsf; Thu, 2 Mar 2017 00:53:30 -0800 (PST) X-Received: by 10.223.164.212 with SMTP id h20mr1841475wrb.196.1488444809991; Thu, 02 Mar 2017 00:53:29 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v186si2486613wma.161.2017.03.02.00.53.29; Thu, 02 Mar 2017 00:53:29 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@googlemail.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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9FDFE68836C; Thu, 2 Mar 2017 10:53:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D6C2568832B for ; Thu, 2 Mar 2017 10:53:02 +0200 (EET) Received: by mail-wm0-f67.google.com with SMTP id n11so3702130wma.0 for ; Thu, 02 Mar 2017 00:53:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=v70ZOz3ZwzYjZJilRWD+w1Pc3IEfolm7mfhV4nj8jIE=; b=Q6Ee7VPSyzZoG40eOXZ+Tf2VEZkIK9EWOWrsbZCNbUjd9fGSessazEZYueXDT5v/4h ZmPPQ5iijmmhoegfsFzIZCYiUiry5HuR/3R2LV3VBthgTwnOjLGRgJrSkWNF05GIIkmo y/hXYBtZN0Ll9fCEPgHseg0WsgCsI87sDT2LeSVcC46SP0G+5tdHaZHkgCoRaLd2GhyH N4Z9DWcdm9cyg3jGxRPoJC6VkRrT61KD50xMh+lZKP0BylzjR4uvSp5IMgw7T6qX/Atk QnWoBnlP9jhTqf/QBvxoGzbkB0+WPQWOAtCgXa6w2ZjFXgv/w2HsjJ0IpTxh8phxPc+6 JYPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=v70ZOz3ZwzYjZJilRWD+w1Pc3IEfolm7mfhV4nj8jIE=; b=pmplKtSVS0UXzMXal1nmeMVTY3e6IvUolxYZHfW9ECz3qTr4Y9efmDkMEsZQPaaxpc KYMZGivufgyJfSMCFRvSvpY6XAonlHv8zX+FxwyIalMgrlSCsxwLm97qsAlWoZwlaSA4 ZxFDz4c0Luqs2QuNeMG5vODm/hLw6smWaE/Vae1DRELlEfpY61dhzTK62L9eY3dCkyDq zlQetKG3W54+RNqK6rc7+A/u3SKB58/b91ef4FclW7GNmhwrIoF6ljKzOgJjXKRm5sfI lf9O+8EqBRcbThzUkbsX2Du0Z2d7sBfxjFdpfc5cBzEbdEpF2C6MzE+93nral35bUScR QDIw== X-Gm-Message-State: AMke39kzmRLf+Ax8eBoShm14mcQE4crhu5/FUaiR4a14MgGUIwU+JrXn0DvEwNhWPbRFCQ== X-Received: by 10.28.74.69 with SMTP id x66mr6728776wma.124.1488444793459; Thu, 02 Mar 2017 00:53:13 -0800 (PST) Received: from localhost.localdomain (p4FF003DA.dip0.t-ipconnect.de. [79.240.3.218]) by smtp.googlemail.com with ESMTPSA id s18sm26177390wmb.18.2017.03.02.00.53.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Mar 2017 00:53:12 -0800 (PST) From: wm4 To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Mar 2017 09:53:03 +0100 Message-Id: <20170302085309.11471-2-nfxjfg@googlemail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170302085309.11471-1-nfxjfg@googlemail.com> References: <20170210123541.32375-1-nfxjfg@googlemail.com> <20170302085309.11471-1-nfxjfg@googlemail.com> Subject: [FFmpeg-devel] [PATCH v3 1/7] ffmpeg: make sure packets put into the muxing FIFO are refcounted X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: wm4 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Some callers (like do_subtitle_out()) call this with an AVPacket that is not refcounted. This can cause undefined behavior. Calling av_packet_move_ref() does not make a packet refcounted if it isn't yet. (And it can't be made to, because it always succeeds, and can't return ENOMEM.) Call av_packet_ref() instead to make sure it's refcounted. I couldn't find a case that is fixed by this with the current code. But it will fix the fate-pva-demux test with the later patches applied. Signed-off-by: wm4 --- ffmpeg.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index 38395e7598..5adec2b290 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -654,7 +654,7 @@ static void write_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost) int ret; if (!of->header_written) { - AVPacket tmp_pkt; + AVPacket tmp_pkt = {0}; /* the muxer is not initialized yet, buffer the packet */ if (!av_fifo_space(ost->muxing_queue)) { int new_size = FFMIN(2 * av_fifo_size(ost->muxing_queue), @@ -669,8 +669,11 @@ static void write_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost) if (ret < 0) exit_program(1); } - av_packet_move_ref(&tmp_pkt, pkt); + ret = av_packet_ref(&tmp_pkt, pkt); + if (ret < 0) + exit_program(1); av_fifo_generic_write(ost->muxing_queue, &tmp_pkt, sizeof(tmp_pkt), NULL); + av_packet_unref(pkt); return; }