From patchwork Wed Mar 14 06:24:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 7978 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp1635796jad; Tue, 13 Mar 2018 23:25:01 -0700 (PDT) X-Google-Smtp-Source: AG47ELsil4NvdGA+3DiNxwQiQGIN1U91Mk68fZ7+6hiFw8vreIAg6YTmWwnx3gjbLNTInNW7WsU6 X-Received: by 10.28.208.71 with SMTP id h68mr525738wmg.118.1521008701712; Tue, 13 Mar 2018 23:25:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521008701; cv=none; d=google.com; s=arc-20160816; b=DCRj9j+qIJQQDYgvwDsM0idpuw2PIGKOJuOYaMVPsHdWNNODOM6Mc2oT6LQ3M/s48O 9qChy+hwUuLVC9yG+DYeY9w/gUFFHU3eQ5Mx3w2ynuYUKdc3ASRtjONr63znVAxfGVK8 WYbzPtlh3U6BFH2zcKPTK0p6Kbn8kmFHW+HTHm4j0VntXS2oo7xjlRWyKtgtSv93w/zw MpfSA6HjjJM0krQv0Ewc5vk0cGWMNv0PPFaFryCuNik0McQDvn/Bz+/bOpq6ri5ZjAiU p/AJhrPSp1z2qLlGxJfNjG1y+qz7VFzHj+Und/TPx9+mShHYdkvsGzW2894iY8R/njeW jZQw== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=mBESS31FTW1xsnMve0xK7rq86kE69A+RV1CC51wZ8i8=; b=0VYcML+i9xxEI3QpC5Rp4w5NTvdfNmgkO/dZitVlm2G/yUjFVMpck0vmePut6xbrCn 0HgeapWTu2zKCSMztvvbio/ZGA9Sq5ZWxxWmOOMlmqiMz+RXkwLVKF2oQEJcZVl2BYsl l0ky3acC2B6VHSpB1zNGaqqhnpd4zieZ3SaVCbv6ZfRZoNScQGggqFNY+PD19RmvRDqn 1ipGUxOFtFsgEHGtxMSTRpHlDHvTKptH0mlor7XrIFwrHlVPTyPgxesKVoheoGglLCBr 1jHu12JbtBUxC5JeR1hR3CYNXg/lPLOW3nAQnvsci0odxWS3LVd/Ly5nINZO27B3T8Yu JYeQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=W1TdkPif; 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 l9si1257345wrh.515.2018.03.13.23.25.00; Tue, 13 Mar 2018 23:25:01 -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=W1TdkPif; 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 6583F689C29; Wed, 14 Mar 2018 08:24:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f173.google.com (mail-io0-f173.google.com [209.85.223.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A66D4689B4A for ; Wed, 14 Mar 2018 08:24:40 +0200 (EET) Received: by mail-io0-f173.google.com with SMTP id k21so3014336ioc.2 for ; Tue, 13 Mar 2018 23:24:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=WZNgFi4zIxOP7/Q8rTEmXg0cv5KAFKXxeTR/Bk39ngw=; b=W1TdkPifh0Z2e1QOHP9Sa3WkU0AR5UZABqsWbF3ZGdGN13kutkhnicVKbv8DH0RT07 kN/3HzVZDscUuEsyDT807/DkoN4MV9Oy7+5rucPTJIAVf2IGIFWRq6LRJKTllSPS7x1y MCFtKixu+BIwsXie3usqx8CfWVs0aYzyfPriVHWieOa4gSCdqjgx7x2qVtMd7kom3icU vTeS6NY2VFXiCVmQogZUjge5OkeR0Bdviv5GSWrnuhou3MJQaI8J41D0m/yi0FTWTuje iI3VBj45biCMe65sNhSrAEQXU7K51Ww/TQKgfn6MLh+7bn1ZLoXxchsg3QIBdJHugP8N 5LSA== 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:in-reply-to :references; bh=WZNgFi4zIxOP7/Q8rTEmXg0cv5KAFKXxeTR/Bk39ngw=; b=ClA1ZbLryNmSzMlv8xCmED7dzTYDOLugboiK907FTvCSO3dmm69YV1VFHa1askRttg lPHxtFTdD/B7gVqfFpE7nuuO4gxyXwPXVpk2ytssGY7Czfey3z7il7eD+qOVi/K1ECP2 nq4GOr4JQsbMxqqQ8JiKd7AOXbFbOHbRPbP/0fdX+gx31D91OsDs/o3mfkJaar//suh7 UslRHDU+ugKJ4RxOVETzQRI1yn3ySjNdavgWRUzzSh3GQhZTsfJhtKKHIi4HIN0bPynx HiWzQjkKUQW+8f2/YnvEFkAO4jhjOgRWjSPttWfCI3GdSN0L6fAAkzOxFPt4SN8uIAiT d4tQ== X-Gm-Message-State: AElRT7GXvb4k8YI9tS+JRgx7hSgfSfpskSItTInj/9Pq0UDGYJGYagPP 7WWllaHIs6FvsCQCL3ejXSkXKGHh X-Received: by 10.107.168.226 with SMTP id e95mr33438ioj.205.1521008690848; Tue, 13 Mar 2018 23:24:50 -0700 (PDT) Received: from Rodgers-MBP.localdomain ([71.201.155.37]) by smtp.gmail.com with ESMTPSA id v134-v6sm394596ith.27.2018.03.13.23.24.50 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 13 Mar 2018 23:24:50 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Wed, 14 Mar 2018 01:24:37 -0500 Message-Id: <20180314062445.89909-2-rodger.combs@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180314062445.89909-1-rodger.combs@gmail.com> References: <20180314062445.89909-1-rodger.combs@gmail.com> Subject: [FFmpeg-devel] [PATCH 02/10] lavf/movenc: fix leak of eac3_priv 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" This could previously happen in error or early-exit cases. The next commit would make it happen in all cases. --- libavformat/movenc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 5b1e66c897..accab417f6 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -5773,6 +5773,12 @@ static void mov_free(AVFormatContext *s) av_freep(&mov->tracks[i].cluster); av_freep(&mov->tracks[i].frag_info); + if (mov->tracks[i].eac3_priv) { + struct eac3_info *info = mov->tracks[i].eac3_priv; + av_packet_unref(&info->pkt); + av_freep(&mov->tracks[i].eac3_priv); + } + if (mov->tracks[i].vos_len) av_freep(&mov->tracks[i].vos_data);