From patchwork Thu May 7 19:08:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Foucu X-Patchwork-Id: 19546 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 3EA3544A887 for ; Thu, 7 May 2020 22:31:36 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 118B468A836; Thu, 7 May 2020 22:31:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f170.google.com (mail-oi1-f170.google.com [209.85.167.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AD40E6882D3 for ; Thu, 7 May 2020 22:31:29 +0300 (EEST) Received: by mail-oi1-f170.google.com with SMTP id o7so6299412oif.2 for ; Thu, 07 May 2020 12:31:29 -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:mime-version :content-transfer-encoding; bh=g6utfhZnpJe/7/3GxgQRoMTWpkc79V+x56B8nPttI8Q=; b=hCcjkS8Uudmd1/7G0hEEMjegLvsyBWfdmq3Sj/5pSIOo26RYGZzRZ02vuQ49ZK1u2h lcbkI6mpTQbEkPezBkVnU0QRa6Bnl1H0+bENq8uULeNJnxuMhgg3gm7r6XeyjsvU5JE4 4NzsobsJMmxYDKLjeVec7yjuX3yPYc+3L1jy5zgwLnSwvQhQu01pkzsI3Rrk87W0SudZ ns+qagGvGy+CQwO1fV8vClzpgGMIm/pL8zmjPCuN6jCYF3qoslwtwR1ClaEtZFJPCZp5 VMeUjf5e56bziLUwYkfvVR2d9JS8mnZ6Cy2Rahsvyftp8mOSYBQfDhTgm1XQEdzzHx0J W1+A== 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:mime-version :content-transfer-encoding; bh=g6utfhZnpJe/7/3GxgQRoMTWpkc79V+x56B8nPttI8Q=; b=OjWwTmHjvfx0KC/BJMDSLPZ/nPkbz3jGrHO3nFDYriiLpCy1fXikEj9GbCIIQjeuH8 HGaWgdCkLhg2Ifg1SsaVSPQMVlMzPOTl3BRRd2EHoQ5pa4f26mZM6pZvzKiTW8pyOJCL fr0UrnU1dzjFgpqNrfxBj2Ri9+KTw47ZksuP/9uVMsr9gXbfCfG15K1CsJkw2bcDek4G HbM16g+s45EhvdCkkGVRFfxENbepVCdUgxQuQths2fT6za0aRgXJiK3sp4M49W7xwXlG aj5VvIV6Lrgo3zOPBSOKcEcjzXzhRZirYvVm3UecOXU2ybKwNaK8W1Gdve1F/qDhGPM1 VMBA== X-Gm-Message-State: AGi0PubqpuKw4eNSZVgQUDIoozlnJPsAVm4rSd71iRN+wSJyekq/d//a 5+ndMRJG/lZ5k/7yTIYPIRMeDnaL X-Google-Smtp-Source: APiQypLebsbuCktz47zDDE4GthKFubQKFMWqleftRSjy/UxaG1wpQ+nWAg2AefVbExLYzlhmibTURg== X-Received: by 2002:a17:90a:37c4:: with SMTP id v62mr1664791pjb.177.1588878510661; Thu, 07 May 2020 12:08:30 -0700 (PDT) Received: from tfoucu.mtv.corp.google.com ([2620:0:1000:4001:8e18:4d51:fb1:d54f]) by smtp.gmail.com with ESMTPSA id j7sm481896pjy.9.2020.05.07.12.08.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 May 2020 12:08:30 -0700 (PDT) From: Thierry Foucu To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 May 2020 12:08:23 -0700 Message-Id: <20200507190823.18524-1-tfoucu@gmail.com> X-Mailer: git-send-email 2.26.2.526.g744177e7f7-goog MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] [libavformat/moc.c] Read the QT Metadata Keys only once 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: Thierry Foucu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" If you have a file with multiple Metadata Keys, the second time you parse the keys, you will re-alloc c->meta_keys without freeing the old one. This change will avoid parsing all the consecutive Metadata keys. --- libavformat/mov.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index ad718cdaa2..062a62d93b 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -7022,7 +7022,8 @@ static int mov_read_default(MOVContext *c, AVIOContext *pb, MOVAtom atom) // https://developer.apple.com/library/mac/documentation/QuickTime/QTFF/Metadata/Metadata.html if (!parse && c->found_hdlr_mdta && atom.type == MKTAG('m','e','t','a') && - a.type == MKTAG('k','e','y','s')) { + a.type == MKTAG('k','e','y','s') && + c->meta_keys_count == 0) { parse = mov_read_keys; }