From patchwork Thu Apr 1 23:27:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 26700 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 46AB644B298 for ; Fri, 2 Apr 2021 02:28:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 231F568A062; Fri, 2 Apr 2021 02:28:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f180.google.com (mail-qk1-f180.google.com [209.85.222.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CCA48687FDA for ; Fri, 2 Apr 2021 02:28:44 +0300 (EEST) Received: by mail-qk1-f180.google.com with SMTP id x14so3919643qki.10 for ; Thu, 01 Apr 2021 16:28:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=vgtyPCP6JwQm9xIJRhQfyLQlJtfMDE/PaYIlI9FGPhs=; b=ROC0XeT542fGBRxn6yWCNhq+vbyGJhyTVCPOWOzMB2utImMTTvhjbvKtGg38s0cGaQ jYGfFatoANj10v42Xy0w8X5wtux9ioNAHIdg3vThDjNlakmTsEYSXoqubRtIg+1faZMZ L1wTC45p3E086Xcj03RrKmShftYmVy+9nzCnz7SlPGa1XlXAgep8LwBENgXBvKfg+gkt 4zHeQY9f7tPetTuTR9Ooc3N3h45vGuOOg1Cto3VKRI0kQtvs3jWMnGJ7OfDfxvCKrtmv /EeyLwICLhDfU09QkKdyBw63TT92hnL7iYUnlIqfPRub0ZaHdi+uG3/TEsmbAeWSZxqj qxzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=vgtyPCP6JwQm9xIJRhQfyLQlJtfMDE/PaYIlI9FGPhs=; b=WZ+OPkqyjOwoaFRH9qbE2fXeddz2ldr/mApADtOFvecgOa7eicGkaEi43gr8QjGuuC Ce0K4PLB6LXHV1XbK5UG25MZsPJ2IpmJNax/gcwfr1MFTq2sXFuUIAPrBuiq8hrak0/r Lk37DEhYHyGKa8rSEaQ9fvHyp+p+Pb67Wd+gPO7GXi5+SJeuZ6CebhAAPimfe5UbB6bM S1fulgmje6tVaxB9ixKLA6sRSzDpOHTJUwLnIq4z2HjaU4PKlFS9K/WwYXtmGyZpbvlK jYeB6OVoGbVBh1dO0fNVs4P+F49Z30sFN5OkCJVU/OeAhPu37EQPhrV2b96+DTDNgTqD yQIQ== X-Gm-Message-State: AOAM531WajXPujOWJYbAjtklIJOH377hyRQTO5D2tuECALeT77L1Nhen jH7FLCgAeELZNA9ia026CB+x72t0v60= X-Google-Smtp-Source: ABdhPJxj3R5fBO2pCpM+8kcN3zY9YsYsZK1QpMtns3BHzauzinuZf6Hxco2/H6RG6IcqzLxZDxoA6Q== X-Received: by 2002:a05:620a:53d:: with SMTP id h29mr10620533qkh.29.1617319723035; Thu, 01 Apr 2021 16:28:43 -0700 (PDT) Received: from localhost.localdomain ([191.83.218.26]) by smtp.gmail.com with ESMTPSA id v6sm5108392qkf.132.2021.04.01.16.28.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Apr 2021 16:28:42 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Apr 2021 20:27:36 -0300 Message-Id: <20210401232738.4908-1-jamrial@gmail.com> X-Mailer: git-send-email 2.31.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/apetag: ensure the binary tag is valid before allocating a stream for it 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" Signed-off-by: James Almer --- libavformat/apetag.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/libavformat/apetag.c b/libavformat/apetag.c index 6f82fbe202..5a8144a27c 100644 --- a/libavformat/apetag.c +++ b/libavformat/apetag.c @@ -63,9 +63,7 @@ static int ape_tag_read_field(AVFormatContext *s) uint8_t filename[1024]; enum AVCodecID id; int ret; - AVStream *st = avformat_new_stream(s, NULL); - if (!st) - return AVERROR(ENOMEM); + AVStream *st = NULL; ret = avio_get_str(pb, size, filename, sizeof(filename)); if (ret < 0) @@ -76,20 +74,23 @@ static int ape_tag_read_field(AVFormatContext *s) } size -= ret; - av_dict_set(&st->metadata, key, filename, 0); - if ((id = ff_guess_image2_codec(filename)) != AV_CODEC_ID_NONE) { - int ret = ff_add_attached_pic(s, st, s->pb, NULL, size); + ret = ff_add_attached_pic(s, NULL, s->pb, NULL, size); if (ret < 0) { av_log(s, AV_LOG_ERROR, "Error reading cover art.\n"); return ret; } + st = s->streams[s->nb_streams - 1]; st->codecpar->codec_id = id; } else { + st = avformat_new_stream(s, NULL); + if (!st) + return AVERROR(ENOMEM); if ((ret = ff_get_extradata(s, st->codecpar, s->pb, size)) < 0) return ret; st->codecpar->codec_type = AVMEDIA_TYPE_ATTACHMENT; } + av_dict_set(&st->metadata, key, filename, 0); } else { value = av_malloc(size+1); if (!value)