From patchwork Wed Feb 15 09:24:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wm4 X-Patchwork-Id: 2556 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp1866569vsb; Wed, 15 Feb 2017 01:24:35 -0800 (PST) X-Received: by 10.223.162.205 with SMTP id t13mr31737280wra.155.1487150675880; Wed, 15 Feb 2017 01:24:35 -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 g109si4307215wrd.9.2017.02.15.01.24.35; Wed, 15 Feb 2017 01:24:35 -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 7B0D8689A33; Wed, 15 Feb 2017 11:24:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 26C3968990D for ; Wed, 15 Feb 2017 11:24:13 +0200 (EET) Received: by mail-wr0-f193.google.com with SMTP id i10so30472526wrb.0 for ; Wed, 15 Feb 2017 01:24:19 -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=26QKfS0qqjcpYJ9QuRwR5oj/8kc0VuyWApt5sJIaie8=; b=mdh5GfTjGlTLO3u6DPPNUdNRS6W1/jUGKXEOGF6kNP4HcizLBiRDFJ3pDPmW3kSHDe mmN+x/NDGLPDwqczr1IWxhI9EkotKGch+ZKfVHeXnssVnrhnvkUJr9QMmUai9nIjYWyW QxVZV7m/gZDJ8AEwpvLuAEBZaG3JuSz+g9Ct20pxXP9BBCGdgDEMZVeCFA1va2UiikSl 3nHv+sPAS219CxSOmN8KEyNVuP4ym9Dm+iu46WkYIGh+zXJUNptQ1H+bXUhDGnrKqP1P cV9A4ZRVc1V1Ic0q/BtepL9KfE/piRMQ5W1JmGDpud0j6DwAJny8TEiFj43Kps45o/E8 8umQ== 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=26QKfS0qqjcpYJ9QuRwR5oj/8kc0VuyWApt5sJIaie8=; b=PGA5/lVvx9VyM3D0usDsJ3H5i1JCifYwRDCHM7eM8gHkJpEAdp3n1ANlCumRXWXJJx KqFpFRNz5ja8wMBIHeVcHJzP0eHSS8bIkCZg/WMYx/rASTWpgL1dPQ3K/SAud+ohaFmn dA7TO2uGZtO5QyIj3AwGi58NVEK549zfzFqf6iqbBXqq69Sfj6c40aw6LEOGJ00WtLOW BO3oSFEEb3gc8jqoaJgTkyK5C67dPZ0ixg2SRbd7TiGoCLZWyaQ9J8WUYzkkDUZoFoS3 DAtHsPAZ2Wok+SfkT99vfJOn1cM/Ev3R4TFXko7Po5JV4LmCN2gtncbT0AwsxVnP+qCb WFrw== X-Gm-Message-State: AMke39mpWWB7Va29rjvTM0Baiw5YQUZeK9Zx2vuuMXS/VazdGmUpxUe8nE2uQFad2VwdWg== X-Received: by 10.223.139.93 with SMTP id v29mr31140303wra.70.1487150658332; Wed, 15 Feb 2017 01:24:18 -0800 (PST) Received: from localhost.localdomain (p4FF0242F.dip0.t-ipconnect.de. [79.240.36.47]) by smtp.googlemail.com with ESMTPSA id u189sm6787730wmu.1.2017.02.15.01.24.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Feb 2017 01:24:17 -0800 (PST) From: wm4 To: ffmpeg-devel@ffmpeg.org Date: Wed, 15 Feb 2017 10:24:16 +0100 Message-Id: <20170215092423.5358-2-nfxjfg@googlemail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170215092423.5358-1-nfxjfg@googlemail.com> References: <20170210123541.32375-1-nfxjfg@googlemail.com> <20170215092423.5358-1-nfxjfg@googlemail.com> Subject: [FFmpeg-devel] [PATCH v2 1/8] 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 06570c0dd0..913c18d92b 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; }