From patchwork Sun Oct 16 20:11:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1024 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp91063vsd; Sun, 16 Oct 2016 13:25:16 -0700 (PDT) X-Received: by 10.194.17.71 with SMTP id m7mr11162599wjd.179.1476649516350; Sun, 16 Oct 2016 13:25:16 -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 cg6si36381011wjc.181.2016.10.16.13.25.14; Sun, 16 Oct 2016 13:25:16 -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 DE2BF6891DB; Sun, 16 Oct 2016 23:25:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f67.google.com (mail-lf0-f67.google.com [209.85.215.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 179C56805C0 for ; Sun, 16 Oct 2016 23:25:05 +0300 (EEST) Received: by mail-lf0-f67.google.com with SMTP id l131so20152096lfl.0 for ; Sun, 16 Oct 2016 13:25:07 -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=++q9GC5kd/A6VlLD6md7LDjRSJT16qmkF6QzID2A8UI=; b=mkRPhB1FG/en7yMORLoviRLe5UpFJujCXy2Gr2wVsIG0vTQmICF4Yd9pwN+uAI60sJ mCjRsKJy7LkLTvWANlGmoPoYJTN/b5QEH9d+E95XWhSSVd1q2ZOZZuLX0ond1JAChx00 6iEGbv1qpW+ZeWFgTcBNghIwZFS0C+KRlAPPSG+WKAhV8SV1byruRlBjnX0ickm3371K LTPTSMRjJgnx3apBot5qRG663LMkZ1BEuJn0kscIosquec2XpjPfOzms0psDR4OAT79i yKygTrXQs+oIh+6tXBmXyZ6l9h2fs/ibEZWBjXUmXH+OVlEpnWeaiqZ2pto9wiavgXu8 Q+wQ== 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=++q9GC5kd/A6VlLD6md7LDjRSJT16qmkF6QzID2A8UI=; b=ThaQ7oDJVEJ6dlC8MhqAyrsCYrUKy1FEnZgSJgDdtw8U11q2dAVWV/TcuGvVfvbG/R KqDkktsfAx/AX9gYZdNRgLmjLZYraGU9FGGpQ2P2PBlD5BwY/RmNCFcduktdEnlI2sNE OV5cSimOLeJCzGeosgn+Bc0m5d+aKWqac1tjthkn8Vr8PK/94SwZYKSKbbbxHlmy2l+J XNbiSgVelg9Day016bP4n2NE4aS3Mt3PHImwK461kfn9TUPuovkM+jPStyqyxBlGQmO0 kuUyiBe2DSDCAoJJYXeF1VIUYR21axHS6luFinHgFt4m0hfXHWgdPwZF/4ILF77IIBH1 pnMg== X-Gm-Message-State: AA6/9RmnLWrJRIINWH6giFnnv9zcrjG6ROK1g1tXE1vVZXCz40sTXAKkEIXvYpkfkLUzpg== X-Received: by 10.28.5.207 with SMTP id 198mr6716445wmf.22.1476648664418; Sun, 16 Oct 2016 13:11:04 -0700 (PDT) Received: from [192.168.2.21] (p5B0720DA.dip0.t-ipconnect.de. [91.7.32.218]) by smtp.googlemail.com with ESMTPSA id o1sm45803820wjh.9.2016.10.16.13.11.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 16 Oct 2016 13:11:04 -0700 (PDT) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: Date: Sun, 16 Oct 2016 22:11:03 +0200 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] matroskadec: 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" The problem was introduced in commit 1273bc6. Signed-off-by: Andreas Cadhalpun --- libavformat/matroskadec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 8847c62..a5d3c0e 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1759,7 +1759,7 @@ static int mkv_field_order(MatroskaDemuxContext *matroska, int64_t field_order) /* workaround a bug in our Matroska muxer, introduced in version 57.36 alongside * this function, and fixed in 57.52 */ - if (sscanf(matroska->muxingapp, "Lavf%d.%d.%d", &major, &minor, µ) == 3) + if (matroska->muxingapp && sscanf(matroska->muxingapp, "Lavf%d.%d.%d", &major, &minor, µ) == 3) bttb = (major == 57 && minor >= 36 && minor <= 51 && micro >= 100); switch (field_order) {