From patchwork Fri Jul 6 19:08:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baptiste Coudurier X-Patchwork-Id: 9638 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp3340158jad; Fri, 6 Jul 2018 12:08:21 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdi/MBI3ILtRwgEJoJwsZCjL4Ms2sURmiuUvGxGdqXs4eoSrd2V/LrmLFk9d6xVmVoBuW0d X-Received: by 2002:adf:8acd:: with SMTP id z13-v6mr8195383wrz.22.1530904101091; Fri, 06 Jul 2018 12:08:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530904101; cv=none; d=google.com; s=arc-20160816; b=SPkHrtA8wRcpSI6l1xg1AtuDTeEt15YULELD0VzNd2tij2w8SJXSHh1pJkt2naWS0Y NS9JWGNicRgxIDivuXiZKuKP9hRGuWp1qWalWtt0/4xKLBo+bC846fHWsdalyAFOX9Kr DIzRXYzXb4V/LK1Qx0q5kCo7WnAWHc3qZSGIfgibqqLIMvtqUB5NerEB0sU3Ek0ddkwO CX+dDK2SXX/QEDNTg8+AcWilXoVn4jORSGIzseAvAZaMGxYn8cBr6HUYU/mBJJRVHESd 8GeMS4SgawWm57F9tZ7qHWa+VLwyuCOoOLvcaDCi/UWw8TglBwOtrJv8iKEagkZHS5XC g+Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=2K6Kmm8NA8+Z9rce//h5rzo/saahZcgGl93AdamjUAc=; b=mUzOA8Ms2QTz3g+a0XTtmqIMicFPxjYAp0KxXT+2JKPukEGPQJ+dAq4aFaPlECobFj s/D84nKaj9WpqiEpysTDNhq0wFmpGKzSS2VaiV9Td/6zUy1rqQ2HPwhcyxKTL3OUC8w3 KXgoX2ZNWi/laLKidvi2oKUFOg3whI98DPJgnV0P72q1gCB3hFqesB7CghpM9TgFaM2c Gh9bVAhxh4bS5QMpZeom3WvM6C47YgmoaF4J3eDqqHqXSFyCORbZ5YuVJiEEoXrNBQl5 01LDd6gb6XehUc5PruxQ+JjitiqsHSbdTEca7NJzQ+21Xs3sLFXivVa2ELr4cfYNE7KV S3Rg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=kSPOjco+; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e10-v6si7967114wro.126.2018.07.06.12.08.20; Fri, 06 Jul 2018 12:08:21 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=kSPOjco+; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 278C468A5F1; Fri, 6 Jul 2018 22:08:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6EBBF689AF7 for ; Fri, 6 Jul 2018 22:08:06 +0300 (EEST) Received: by mail-pg1-f176.google.com with SMTP id r5-v6so272182pgv.0 for ; Fri, 06 Jul 2018 12:08:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=t2drYG8xT1q73dWRaMNr8d1Q8DLvdiBITvizh0E9CJQ=; b=kSPOjco+VlcWXw8z69Nx01UdZ0BwDqyn31OrA+DQumOjKSCz0RCWvuiT1Do5PHYPb9 AtO4YHtKLytN83MmTzdLCigmnNR79RWTj+VpCLdhiTgfSsO0+2n/lcSE2B/JBn8javAF G7TS2gDlFv/956toN2pPtbdk85AtvIZMwJLg4reZ6UjSnx+9GrUd28vOhs0iL7zQ2Nhg GwrvZY52oFCexOc3OLWYmt2mY5en3I/n+kPbxE0CV1SUg+zEhib/fqYCDXySIHww01fA TgKqeiBPZfPcO5HhGIiGElohckMvi2d0L5oKD7Vrvs8UNcGhscDzdgdxl3QMMcGCNufX 1R9w== 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; bh=t2drYG8xT1q73dWRaMNr8d1Q8DLvdiBITvizh0E9CJQ=; b=mxTDTWnQu8+0H7oSLqub7flWKANJkPQqLjYq83jzw7DR2Cip6Nfp6I+/ne3FTtAbAI tJCLV4NZXEUUEY8mQcsjayWqmzPz8MTVSLq3mNctzdIJcaITKC3w8fshj60Qh+YZZMsD ris7YClSLqjrGqUbOc3GbiGe0jOINV8EeG8d91j/frYIbJxsouRIORzz72CCwG8ma3Bg OD2RWg3FqfCRZoUSSz1jbHHOVzZMpKyc6cNiZmCZ2PWzPyI9kLhitx9yZZaeR1gOWF8J TuZ5+RMEnZcYp7r81DPVGVAXJDq0z9UITgHFIdZ4ZIJQ4mfgYD5Vf95Lohm3qwKtnuMX r1bQ== X-Gm-Message-State: APt69E2aKqG5kjO3I+tScKYAWCop1WQDvRD2kjKqKPWrIrHbA3PbpKqN h2kWia2ejGrnptOd/ht5zKJOlg== X-Received: by 2002:a62:4083:: with SMTP id f3-v6mr9209057pfd.229.1530904089602; Fri, 06 Jul 2018 12:08:09 -0700 (PDT) Received: from C02S300FG8WN.sc-corp.net (rrcs-76-81-249-42.west.biz.rr.com. [76.81.249.42]) by smtp.gmail.com with ESMTPSA id c141-v6sm6530217pfc.25.2018.07.06.12.08.08 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 06 Jul 2018 12:08:08 -0700 (PDT) From: Baptiste Coudurier To: ffmpeg-devel@ffmpeg.org Date: Fri, 6 Jul 2018 12:08:07 -0700 Message-Id: <20180706190807.78691-1-baptiste.coudurier@gmail.com> X-Mailer: git-send-email 2.17.0 (Apple Git-106) Subject: [FFmpeg-devel] [PATCH] lavf/mxfdec: only call mxf_free_metadataset when ctx_size is != 0, otherwise ctx == mxf 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/mxfdec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index c7f90b29f2..819e4dfeb9 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -2711,7 +2711,8 @@ static int mxf_read_local_tags(MXFContext *mxf, KLVPacket *klv, MXFMetadataReadF if (ctx_size && tag == 0x3C0A) { avio_read(pb, ctx->uid, 16); } else if ((ret = read_child(ctx, pb, tag, size, uid, -1)) < 0) { - mxf_free_metadataset(&ctx, !!ctx_size); + if (ctx_size) + mxf_free_metadataset(&ctx, 1); return ret; } @@ -2720,7 +2721,7 @@ static int mxf_read_local_tags(MXFContext *mxf, KLVPacket *klv, MXFMetadataReadF if (avio_tell(pb) > klv_end) { if (ctx_size) { ctx->type = type; - mxf_free_metadataset(&ctx, !!ctx_size); + mxf_free_metadataset(&ctx, 1); } av_log(mxf->fc, AV_LOG_ERROR,