From patchwork Thu Nov 17 21:55:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1465 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp1020220vsb; Thu, 17 Nov 2016 13:55:48 -0800 (PST) X-Received: by 10.28.60.5 with SMTP id j5mr20296725wma.119.1479419748487; Thu, 17 Nov 2016 13:55:48 -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 fk2si4708281wjb.20.2016.11.17.13.55.48; Thu, 17 Nov 2016 13:55:48 -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 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 05A8D68A031; Thu, 17 Nov 2016 23:55:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BC5AE689F28 for ; Thu, 17 Nov 2016 23:55:38 +0200 (EET) Received: by mail-wm0-f66.google.com with SMTP id m203so25403282wma.3 for ; Thu, 17 Nov 2016 13:55:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=YGVm8W7a8fhujwjI9wNJCwWLDG9+qHpKI6SbHA0pgII=; b=aVhRHVWge6m64zq1Oz1OGVZZjLl1naxhS4tbu+ywyuz55tMSfyJukPrf6jfP/VgG6/ 8eBjxpZQacqJs7UPZBCLVStebaTV4ImxqVwDoYsymzm3cUUlmoanCuty2v+KgE70Euk+ r79b3r8M9zjtr4Tq02q+sMDYfUgdruGxbZ888MO3LKzkHPr54Je82T05f85niQVnC7XL 4aPh0xFUjFArh1ESGNLVV5+LnfLgmhHEi0Z6PzmM4cAvxGfkdvIuCOOyFD7LaCV2lxgU O0BEQEjeL0tDWYwgijmEjvALtdCIb34aHPtE+hJPqUYQk24EFdwbAPqAk8da34VaZAbF CD8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=YGVm8W7a8fhujwjI9wNJCwWLDG9+qHpKI6SbHA0pgII=; b=RHJToqU4wI86o4PACMy8D1TonuRjqGaKUNfPV8051tpgiahX/xxhcv036xV6GBigCn YrAKndTqbbfRw4djhBTmG9ZqG0H9RUp2zRX1qUmMXCkjLpMmxozKRXytmgTw6Yenh3vC PGlXOKYWocSVoHTCTkbLSfHaW1uq7AhlUdY1DRUaS8WxYNsqDcunO9FP8RUbntQHT4sT ZIFydhBzbqGlq+Jivaw4YwRfskUybtUzu/oxQJU1usZlh2AxSzlP3DLMIxwFCJ8jFD+a neYaX0WAMqL8PGDAKJ91ZfrZt/wPi7vJrHYfTb2HApTmJYkXaigNmkF/mKu6iT4mMrbb c1Fw== X-Gm-Message-State: ABUngvcXm8FyFBXmCSFyxqG7+ZJ3faBNZDZblJla5maKH0eM+XUbh4Qng/ahxZ2dFJPkfg== X-Received: by 10.28.12.84 with SMTP id 81mr6877744wmm.51.1479419739463; Thu, 17 Nov 2016 13:55:39 -0800 (PST) Received: from [192.168.2.21] (pD9E8F8EC.dip0.t-ipconnect.de. [217.232.248.236]) by smtp.googlemail.com with ESMTPSA id v2sm5399694wja.41.2016.11.17.13.55.38 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Nov 2016 13:55:39 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: <2b756808-5aac-1eac-70a6-250af5ccd1f6@googlemail.com> Date: Thu, 17 Nov 2016 22:55:38 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] mxfdec: fix NULL pointer dereference in mxf_read_packet_old 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Metadata streams have priv_data set to NULL. Signed-off-by: Andreas Cadhalpun --- libavformat/mxfdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index a1a79ce..2ad0c28 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -3135,7 +3135,7 @@ static int mxf_read_packet_old(AVFormatContext *s, AVPacket *pkt) if (mxf->nb_index_tables >= 1 && mxf->current_edit_unit < t->nb_ptses) { pkt->dts = mxf->current_edit_unit + t->first_dts; pkt->pts = t->ptses[mxf->current_edit_unit]; - } else if (track->intra_only) { + } else if (track && track->intra_only) { /* intra-only -> PTS = EditUnit. * let utils.c figure out DTS since it can be < PTS if low_delay = 0 (Sony IMX30) */ pkt->pts = mxf->current_edit_unit;