From patchwork Tue Oct 15 11:17:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15764 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id CFC39446F1C for ; Tue, 15 Oct 2019 14:32:10 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BA0BF68A0FB; Tue, 15 Oct 2019 14:32:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BCA4C6881DA for ; Tue, 15 Oct 2019 14:32:03 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id a6so20442484wma.5 for ; Tue, 15 Oct 2019 04:32:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iWzlYgbHW3+SD54JwiWIIQirZzjE8DSbfaapj6lShV8=; b=fBCh2wAGZOaTss5H+PqB+Zh/SkMQQ1LO6/mdqHcg6DisNZYtF57/+68Zx1/KHGzmhp OrsNYPfKLKmcSJDhrPFLk4jEo+6RQmuX1PbRWTitCCUQVQ3mfSthnR1EZ1GNOhc0Hj+x ARXt6P4sncGTku1Jg+OnVrIYWRBmRAoiFQ7eLwYEx1jQDTp7hPJPIEE9EdU2EkbXpYKM HjBL/Tt8Jw1nbiUwp67lUWDNQqMPUvYPJ2j6jfDD7Qg3dSH3lebYyj0yOZ/HOzimeHV9 9o/5hyXCybVClDxQF8ajz+BORyBiKDraYiiXhFVojydFILaraZ4k3iHCiSrfpa6Hza2c bYEA== 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:mime-version:content-transfer-encoding; bh=iWzlYgbHW3+SD54JwiWIIQirZzjE8DSbfaapj6lShV8=; b=fBz1waPPqtT0oOuVv7N1EexZciFaEA+D1nlR5rBq4bHjYzFbCwjNCCxmcpvJJ1bnB6 KaD1NvKTWeZmItz1LRW7pyODmt3/2CCDS4ND0WgCBAEYa5ysj+kekX3tk25BC/0EJagK 6ZTIe4OnyayNSNLpVnRzSKWff0RMvjfsKMC5Wv/ELGuDILpdP1/HVlVQDxxsOzd/95lO i/5Ti7gRXWPnyxuhYdQb7za/mQCurFyqg4fV6CYGZqn3avLDpqgN+p6awtLgqzIIikaR Nl/LJKwlNxJ22JeyeGCFLcVXWMbgcWQGdw9odRySoiDlXdHowwVkIW0kL9eOqR/vA3wq 9tEg== X-Gm-Message-State: APjAAAVp3ylH+aDOZ4nB6kT416V5zhqdZvExxGrpvgLj2I0cDiXvzNiH DGXk2Qk4TMbgtyr10EilD/jICl5I X-Google-Smtp-Source: APXvYqx4w7Ehi1Fn0Zp/lV9fqRbNI7JGbrJBP7BKXxiq1sjOpyL81E3PKXXZMsGCGSHaTFIqRllP9A== X-Received: by 2002:a1c:4805:: with SMTP id v5mr19891515wma.130.1571138740523; Tue, 15 Oct 2019 04:25:40 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc08937.dynamic.kabel-deutschland.de. [188.192.137.55]) by smtp.gmail.com with ESMTPSA id y3sm4364637wmg.2.2019.10.15.04.25.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2019 04:25:39 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Oct 2019 13:17:35 +0200 Message-Id: <20191015111737.14246-7-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191015111737.14246-1-andreas.rheinhardt@gmail.com> References: <20191015111737.14246-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 7/9] avformat/matroskaenc: Add check for using explicit track number 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" When creating dash streams, the track number is externally prescribed and not derived from the number of streams in the AVFormatContext. Up until now, a track number of zero was allowed, although this is an illegal track number; furthermore, it was not checked whether the number of tracks for a file using an explicit track number was more than one, as such a file would be invalid (it would be impossible to tell to which track a block belongs if different tracks share the same track number). Signed-off-by: Andreas Rheinhardt --- Using 0 as dash_track_number could lead to an access to mkv->last_track_timestamp[-1] (before said field was moved to mkv_track). libavformat/matroskaenc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 9df3f929d7..7c9941c567 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1858,6 +1858,9 @@ static int mkv_write_header(AVFormatContext *s) } else mkv->mode = MODE_MATROSKAv2; + if (mkv->is_dash && s->nb_streams != 1) + return AVERROR(EINVAL); + if (mkv->mode != MODE_WEBM || av_dict_get(s->metadata, "stereo_mode", NULL, 0) || av_dict_get(s->metadata, "alpha_mode", NULL, 0)) @@ -2773,7 +2776,7 @@ static const AVOption options[] = { { "cluster_size_limit", "Store at most the provided amount of bytes in a cluster. ", OFFSET(cluster_size_limit), AV_OPT_TYPE_INT , { .i64 = -1 }, -1, INT_MAX, FLAGS }, { "cluster_time_limit", "Store at most the provided number of milliseconds in a cluster.", OFFSET(cluster_time_limit), AV_OPT_TYPE_INT64, { .i64 = -1 }, -1, INT64_MAX, FLAGS }, { "dash", "Create a WebM file conforming to WebM DASH specification", OFFSET(is_dash), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS }, - { "dash_track_number", "Track number for the DASH stream", OFFSET(dash_track_number), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 127, FLAGS }, + { "dash_track_number", "Track number for the DASH stream", OFFSET(dash_track_number), AV_OPT_TYPE_INT, { .i64 = 1 }, 1, 127, FLAGS }, { "live", "Write files assuming it is a live stream.", OFFSET(is_live), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS }, { "allow_raw_vfw", "allow RAW VFW mode", OFFSET(allow_raw_vfw), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS }, { "write_crc32", "write a CRC32 element inside every Level 1 element", OFFSET(write_crc), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, FLAGS },