From patchwork Fri Nov 4 23:20:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1306 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp76999vsb; Fri, 4 Nov 2016 16:20:33 -0700 (PDT) X-Received: by 10.28.216.65 with SMTP id p62mr559007wmg.92.1478301633176; Fri, 04 Nov 2016 16:20:33 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y192si7852280wmy.38.2016.11.04.16.20.32; Fri, 04 Nov 2016 16:20:33 -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; 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 89650689A28; Sat, 5 Nov 2016 01:20:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E1AE0689737 for ; Sat, 5 Nov 2016 01:20:19 +0200 (EET) Received: by mail-wm0-f68.google.com with SMTP id c17so6021760wmc.3 for ; Fri, 04 Nov 2016 16:20:23 -0700 (PDT) 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=4vS/Yka3OaeLZVFCPqnE6rwg2Yie69ym8wX23RejuU8=; b=fONM/07KXB9LmGts3EHOrH4bk4RrbY/ups+JGDXL/++9PO4mN376tjZTw70bVZzb/4 ElPcifKXQhb6Un/cOIIf+gnwaGPOajjOr0oZ1rJfl2BLSQIlgMxwskcfu1cULeu8n/Hw j77ThSxBJDb7KSHQ5fNu3lg4pgBTqJpVrEakrzAzhY2p7qEsrsBxBMinSbGYOmr5xHAO 64GcU4/PpbnbgmanPlvAh+WCBOnwm1+nNt62U+t/0edTPn6cOK0VT/lFDbzgP6Qle5up k+Wyb2lufY4TrCuKanW22vexYV3qtgTn9YG6ouCgQuZSbu7QPJ3m/gANICtVtb0RSil7 FrRg== 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=4vS/Yka3OaeLZVFCPqnE6rwg2Yie69ym8wX23RejuU8=; b=ex1wbHULndrDXawNpdFKs45PStjL2NHzCB+rPLMP3cRnVdx4s7XGJBiTAFqO/oBi+C VOXcYx8CdsOBOucdBJgFtsJ42uVVSjnNgwOw/lXLL0CUeu5/OoRdPjxWjchORxMja6uV SUsfyzf3ZFiVYAb0Lc8HE1wnu0HTBVO8bf5bZuWejn1M1VDX+Q4EWBy904srbMmvYFKI BE2UGXA2kJ/x8pUAxxpnmzXNUbcr+bmbo6fQADJXZKRWkQCXNXyHcoGeUSHCnllK0CQX /xvX/lwICYtOhyOKNk1H+xwoOoq/DlRmhLi3KkNNaZKXVUwfIAStrV/7bhtHMWI9Vsnc uT5w== X-Gm-Message-State: ABUngvcXJz/ZhKac9BGnkw69DatXwIv6R2y+3xJazB3T/Woo7wwBSGCvGvQVWe1tcgoG2g== X-Received: by 10.28.7.198 with SMTP id 189mr609954wmh.65.1478301622787; Fri, 04 Nov 2016 16:20:22 -0700 (PDT) Received: from [192.168.2.21] (p5B09506C.dip0.t-ipconnect.de. [91.9.80.108]) by smtp.googlemail.com with ESMTPSA id k74sm6953655wmd.18.2016.11.04.16.20.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Nov 2016 16:20:22 -0700 (PDT) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: <3ceeccd6-d64b-4426-d8ea-2ccf3b4b3211@googlemail.com> Date: Sat, 5 Nov 2016 00:20:21 +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 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 d2166ee..a1a79ce 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -391,7 +391,7 @@ static int mxf_get_stream_index(AVFormatContext *s, KLVPacket *klv) for (i = 0; i < s->nb_streams; i++) { MXFTrack *track = s->streams[i]->priv_data; /* SMPTE 379M 7.3 */ - if (!memcmp(klv->key + sizeof(mxf_essence_element_key), track->track_number, sizeof(track->track_number))) + if (track && !memcmp(klv->key + sizeof(mxf_essence_element_key), track->track_number, sizeof(track->track_number))) return i; } /* return 0 if only one stream, for OP Atom files with 0 as track number */