From patchwork Fri Mar 19 05:58:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26468 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 B9302449D11 for ; Fri, 19 Mar 2021 07:59:49 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A547568A831; Fri, 19 Mar 2021 07:59:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4489E68A6EA for ; Fri, 19 Mar 2021 07:59:41 +0200 (EET) Received: by mail-ej1-f50.google.com with SMTP id w3so7734925ejc.4 for ; Thu, 18 Mar 2021 22:59:41 -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:reply-to :mime-version:content-transfer-encoding; bh=JdMjfhNc6gbxHGJgcNG9rw2Ui2HndBuVyRE4e5AqRuE=; b=Y/I70ctwjSvV7mgZ0X/g/IA09Ni2ikD6tDIz1PHaViI5tDmQpgm0puZjbI2B8d74Lb aZ+OKbJLLp4+H4QO30mAVtrB982u9EzfKnsPre/Fkpn4M8yfAmHjP+/vHrPpdkqj/+ot bLhnZ8eGLK9C5ahr4Swr7zpFztLAYm0+ujy/d1egAmXDnfVVbph55M2BcolbFkiuJrdi C/eOa4SHHE8fKnG8skpf7PyAEnFQQhZYQhZ52K6NrnXaARA+UVLKvicu/Ip6fyUdrM6b LvOdZ8SU6AFuYF1BJq48mr9VelN610gHTY9OnLhgiZrt8jXj2jQRMHP+VyqQhXyOQQzO Ni9w== 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:reply-to:mime-version:content-transfer-encoding; bh=JdMjfhNc6gbxHGJgcNG9rw2Ui2HndBuVyRE4e5AqRuE=; b=L0XJg5LvreJhS+8ZFzs5neE+hqTPSFOc7N2B0bNodUhu9Y/7KzLkh0m0t8xVzDtn1d U3+HUbEFQDTDulAB00J9IuNvstSX/pkisA5TxLHLbu/4/Zvi/ttrrhlILJ/iIl8/N36k eEc3goSY0ha596+No+UTbtdRij7/uDaQgn7ShzILZxyP0V7Ae3oAXTRGU7k9HalUJS4q YEU6VrR/YddDD+iczXWw+L+7+xRrGj7OhQcg79/lJUVlWyfuTtZ9LUUtjPzSwf2cs8Oc SbTK9NIn3dxUheh5hm+am6J0e3Jgbxsm/MPQehC3KNnYnqfuxCJN3duqzrvuYdaXGCBc pRzA== X-Gm-Message-State: AOAM531p9188BgD3QcCLY/5MdUo4XLd57SmvAa271H7KgCbVmlu80fl2 5bL4DAd1Shk2udqCqfwUger+ZTdQNhJEbQ== X-Google-Smtp-Source: ABdhPJyazjYwmxuiMc0i6wdqYMDuXW/WbOHgKdQayt27GfdqD6/OjKPFmdZjdN5q4i3lNOni2Xd5Ig== X-Received: by 2002:a17:906:5495:: with SMTP id r21mr2442649ejo.471.1616133580566; Thu, 18 Mar 2021 22:59:40 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc08960.dynamic.kabel-deutschland.de. [188.192.137.96]) by smtp.gmail.com with ESMTPSA id x17sm3109344ejd.68.2021.03.18.22.59.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Mar 2021 22:59:40 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Mar 2021 06:58:52 +0100 Message-Id: <20210319055904.2264501-6-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210319055904.2264501-1-andreas.rheinhardt@gmail.com> References: <20210319055904.2264501-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/18] avformat/apetag: Avoid stack packet when reading attached picture 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" Read it directly into AVStream.attached_pic. Signed-off-by: Andreas Rheinhardt --- libavformat/apetag.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavformat/apetag.c b/libavformat/apetag.c index 454c6c688b..23ee6b516d 100644 --- a/libavformat/apetag.c +++ b/libavformat/apetag.c @@ -79,10 +79,9 @@ static int ape_tag_read_field(AVFormatContext *s) av_dict_set(&st->metadata, key, filename, 0); if ((id = ff_guess_image2_codec(filename)) != AV_CODEC_ID_NONE) { - AVPacket pkt; int ret; - ret = av_get_packet(s->pb, &pkt, size); + ret = av_get_packet(s->pb, &st->attached_pic, size); if (ret < 0) { av_log(s, AV_LOG_ERROR, "Error reading cover art.\n"); return ret; @@ -92,7 +91,6 @@ static int ape_tag_read_field(AVFormatContext *s) st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; st->codecpar->codec_id = id; - st->attached_pic = pkt; st->attached_pic.stream_index = st->index; st->attached_pic.flags |= AV_PKT_FLAG_KEY; } else {