From patchwork Tue Apr 28 08:36:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19304 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 E64C244B819 for ; Tue, 28 Apr 2020 11:40:21 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CF7F268BE51; Tue, 28 Apr 2020 11:40:21 +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 A466A68BE10 for ; Tue, 28 Apr 2020 11:40:10 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id g12so1868264wmh.3 for ; Tue, 28 Apr 2020 01:40:10 -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=gOR7krMdE/LC2CxgmlV5mEF39vTIyUTbNzDzdyqjdF8=; b=G7H67xpBNDkLK2ByoYrFLYP8N54mMNUR/HkhvCE72JciLzl3GukZiuoGqQPoyCE1Zu KbV8WdM07JI3hbaa/tyUWf2gTQhQKEI4pZ0VI/6Sa717GNTw4kj6vC44X9vZesxzehlT rdN5zIJcYz6IzQrOimmUdCbxGRv78dPnQkiOENzLF3m0DOqfFfnZxNWkF5TiK37OHp7a SXkkeGU0Nv1CLjGaGaGzaq6eQ+aMcj3pL/ip4cansGzTw1NakLmqRpjJjJM8Pgp7v/wz eQQPTXfbflht/CrzSOrydt0dx8hrchw7uQFAY1FTA2PMeTVtKooGPz5HctEDT+IrTwrv ug1Q== 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=gOR7krMdE/LC2CxgmlV5mEF39vTIyUTbNzDzdyqjdF8=; b=b128EWSRbUX/ZSzwEU4FaDskdPjGGvpo6Zq6QtQri8BiHfr5wLF5TUhGJ6qM53KsX/ mBS0aEFBKdiyQGDnk/dq+qroaPlhavLEPV7BdqYzpML90MmTa1S/zeySneip5fJ3Nz0T WYkxLiy5+A8Pw73f1iG1KS5Nb/bU6/f8G6wT95MkC+fYpxKGrj8v58HalRI0KFdSuGBg P85Kx3p/LyVvMsLtvRjAoaZ2WygDh5B3ynNq9DZPk2YGIDgx5HY2CIaFEtbZFPPgQBpT wc5VAqd9qgy+UmfZQpV3B0IRcTnet3Z5E0hYM4BoXT4EOfUEuucJG+kLW0+W0MP3Gwda bauA== X-Gm-Message-State: AGi0PuZ7Xfn5FgagJq5ADnH+amnQP7jXlpJiwbw1MF73d0IQg9Ddx7hO mQo0cHQjk0FehESiQn+3zr+2PPfb X-Google-Smtp-Source: APiQypI8UHkvOtK38YSjTEol8QsQPdykJDpLu8IRpcdrej6gGxlST9Scx49ZkQahNJT9wYuIpgKqpg== X-Received: by 2002:a1c:dd8a:: with SMTP id u132mr3155627wmg.87.1588063209799; Tue, 28 Apr 2020 01:40:09 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id w11sm2258351wmi.32.2020.04.28.01.40.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Apr 2020 01:40:09 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 Apr 2020 10:36:45 +0200 Message-Id: <20200428083645.4909-7-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200428083645.4909-1-andreas.rheinhardt@gmail.com> References: <20200428083645.4909-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 7/7] avformat/matroskaenc: Check mimetypes earlier 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" This avoids errors lateron after the file header has already been partially written. Signed-off-by: Andreas Rheinhardt --- Also avoids a memleak in case of missing mimetype metadata. libavformat/matroskaenc.c | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 09f08c1e9f..a1b613290c 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1687,6 +1687,23 @@ static int mkv_write_tags(AVFormatContext *s) return 0; } +static const char *get_mimetype(const AVStream *st) +{ + const AVDictionaryEntry *t; + + if (t = av_dict_get(st->metadata, "mimetype", NULL, 0)) + return t->value; + if (st->codecpar->codec_id != AV_CODEC_ID_NONE) { + const AVCodecDescriptor *desc = avcodec_descriptor_get(st->codecpar->codec_id); + if (desc && desc->mime_types) { + return desc->mime_types[0]; + } else if (st->codecpar->codec_id == AV_CODEC_ID_TEXT) + return "text/plain"; + } + + return NULL; +} + static int mkv_write_attachments(AVFormatContext *s) { MatroskaMuxContext *mkv = s->priv_data; @@ -1707,7 +1724,7 @@ static int mkv_write_attachments(AVFormatContext *s) mkv_track *track = &mkv->tracks[i]; ebml_master attached_file; const AVDictionaryEntry *t; - const char *mimetype = NULL; + const char *mimetype; if (st->codecpar->codec_type != AVMEDIA_TYPE_ATTACHMENT) continue; @@ -1721,21 +1738,9 @@ static int mkv_write_attachments(AVFormatContext *s) return AVERROR(EINVAL); } put_ebml_string(dyn_cp, MATROSKA_ID_FILENAME, t->value); - if (t = av_dict_get(st->metadata, "mimetype", NULL, 0)) - mimetype = t->value; - else if (st->codecpar->codec_id != AV_CODEC_ID_NONE ) { - const AVCodecDescriptor *desc = avcodec_descriptor_get(st->codecpar->codec_id); - if (desc && desc->mime_types) { - mimetype = desc->mime_types[0]; - } else if (st->codecpar->codec_id == AV_CODEC_ID_TEXT) - mimetype = "text/plain"; - } - if (!mimetype) { - av_log(s, AV_LOG_ERROR, "Attachment stream %d has no mimetype tag and " - "it cannot be deduced from the codec id.\n", i); - return AVERROR(EINVAL); - } + mimetype = get_mimetype(st); + av_assert0(mimetype); put_ebml_string(dyn_cp, MATROSKA_ID_FILEMIMETYPE, mimetype); put_ebml_binary(dyn_cp, MATROSKA_ID_FILEDATA, st->codecpar->extradata, st->codecpar->extradata_size); put_ebml_uid(dyn_cp, MATROSKA_ID_FILEUID, track->uid); @@ -2672,6 +2677,10 @@ static int mkv_init(struct AVFormatContext *s) if (mkv->mode == MODE_WEBM) { av_log(s, AV_LOG_WARNING, "Stream %d will be ignored " "as WebM doesn't support attachments.\n", i); + } else if (!get_mimetype(st)) { + av_log(s, AV_LOG_ERROR, "Attachment stream %d has no mimetype " + "tag and it cannot be deduced from the codec id.\n", i); + return AVERROR(EINVAL); } mkv->nb_attachments++; continue;