From patchwork Wed Aug 11 19:32:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 29442 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp67657iod; Wed, 11 Aug 2021 12:32:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyRYhLkmo7Ic4OuMN4lcpdd71qo+mkihHXMC8RektiZvuLQV1cNxLIbHT2+0MALgHZFUNo7 X-Received: by 2002:a17:906:368e:: with SMTP id a14mr148499ejc.60.1628710372182; Wed, 11 Aug 2021 12:32:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628710372; cv=none; d=google.com; s=arc-20160816; b=GJsFTSRmjGwFk4WNFogpwHcaGmRoVvWZ15UDKBDsfu8aqgnD8GE4s19OyscEhTwvOF 7ZvccWKE8iOA9DJ+prGUOjghFF/OkpMCFs0PNNx3tXMppAtekGYvP9mEqUsMqmoI+UjC tJjVWcCV4fkrHjXZXSCTzs5d0psFE3c3AUSG76zzQLhxJUheb/YNKjN/w2ELwV6qojQr JqI+hl/kdoq4t7itPpoCIiUnXQj/bVEydUJpWWf9R4paCwfSeFN1PmwOB5dj+9bdFsqZ njP2VZIspx1l8HKSriYUupNvNvWp68Dgxow/EAil4sWFxrnjp3SJTXwv0yhQ+0K1jJmo BfRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=Z1KvtPrC9JvisK265fMhDBo4Pxs43JTjVEbHtFJPe8o=; b=S7z76337iHVAOlDzDuvYxjesDV426237V5A7KMwSVAfHbg9QLR4M7jwW7prJl1Olel Xn2DwDJsk57P5l4zPUP+PsRo5+yXp9TlMrNG8rAdXQsnRfMydKVYdEQvNvHNgxuT54oG 0U3gXICPtnMbh1Mh7Kkhw6DlEX5y+jjbqERC0ejVKYXm6En9pZmuUhPFHHUzDBOUUeQL DLuCyrmRyYfmA6ZLnn/cbmIjSLKyxffaaVbpUQbPGEG0yUPHzIPIieehO5tvAV1fAdj5 ed2hi7EHDLXFiEzoM+okkdmbZWC+yEDMt18vwLdyobOhokWKF/IAPyOcsjEaQy2LRhzt eZUw== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a3si238594edy.351.2021.08.11.12.32.50; Wed, 11 Aug 2021 12:32:52 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EE77068A576; Wed, 11 Aug 2021 22:32:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 25AC768A009 for ; Wed, 11 Aug 2021 22:32:41 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id C62E2E5BDE; Wed, 11 Aug 2021 21:32:40 +0200 (CEST) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id V_uuno4eh1cZ; Wed, 11 Aug 2021 21:32:35 +0200 (CEST) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id DB3B1E5ADF; Wed, 11 Aug 2021 21:32:34 +0200 (CEST) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Wed, 11 Aug 2021 21:32:32 +0200 Message-Id: <20210811193232.15306-1-cus@passwd.hu> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/mxfdec: store parition score instead of partition pointer in metadata X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Marton Balint Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: RVCdnyFwrhQi Partition struct may be reallocated, so let's store the score directly in order to avoid use-after-free. Also mxf->current_partition might be null when reading some local tags. Signed-off-by: Marton Balint --- libavformat/mxfdec.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 34cbd2cd77..55f2e5c767 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -108,7 +108,7 @@ typedef struct MXFPartition { typedef struct MXFMetadataSet { UID uid; - MXFPartition *partition; + uint64_t partition_score; enum MXFMetadataSetType type; } MXFMetadataSet; @@ -831,21 +831,25 @@ static int mxf_read_partition_pack(void *arg, AVIOContext *pb, int tag, int size return 0; } -static int partition_score(MXFPartition *p) +static uint64_t partition_score(MXFPartition *p) { + uint64_t score; + if (!p) + return 0; if (p->type == Footer) - return 5; - if (p->complete) - return 4; - if (p->closed) - return 3; - return 1; + score = 5; + else if (p->complete) + score = 4; + else if (p->closed) + score = 3; + else + score = 1; + return (score << 60) | ((uint64_t)p->this_partition >> 4); } static int mxf_add_metadata_set(MXFContext *mxf, MXFMetadataSet **metadata_set) { MXFMetadataSet **tmp; - MXFPartition *new_p = (*metadata_set)->partition; enum MXFMetadataSetType type = (*metadata_set)->type; // Index Table is special because it might be added manually without @@ -854,10 +858,9 @@ static int mxf_add_metadata_set(MXFContext *mxf, MXFMetadataSet **metadata_set) if (type != IndexTableSegment) { for (int i = 0; i < mxf->metadata_sets_count; i++) { if (!memcmp((*metadata_set)->uid, mxf->metadata_sets[i]->uid, 16) && type == mxf->metadata_sets[i]->type) { - MXFPartition *old_p = mxf->metadata_sets[i]->partition; - int old_s = partition_score(old_p); - int new_s = partition_score(new_p); - if (old_s > new_s || old_s == new_s && old_p->this_partition > new_p->this_partition) { + uint64_t old_s = mxf->metadata_sets[i]->partition_score; + uint64_t new_s = (*metadata_set)->partition_score; + if (old_s > new_s) { mxf_free_metadataset(metadata_set, 1); return 0; } @@ -2894,7 +2897,7 @@ static const MXFMetadataReadTableEntry mxf_metadata_read_table[] = { static int mxf_metadataset_init(MXFMetadataSet *ctx, enum MXFMetadataSetType type, MXFPartition *partition) { ctx->type = type; - ctx->partition = partition; + ctx->partition_score = partition_score(partition); switch (type){ case MultipleDescriptor: case Descriptor: