From patchwork Mon Dec 16 00:04:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16810 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 C07B844A07A for ; Mon, 16 Dec 2019 02:04:47 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A8E8F68AA9D; Mon, 16 Dec 2019 02:04:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6964768A6D5 for ; Mon, 16 Dec 2019 02:04:40 +0200 (EET) Received: by mail-wm1-f68.google.com with SMTP id t14so4789067wmi.5 for ; Sun, 15 Dec 2019 16:04:40 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=yZk5ii2zIH0FpjRu2Vo47u1O/jylveEEimlXiUcar7c=; b=D2zOUK0p8belQ2llmXAnbypdOXunDprg3OmPoCt7dR7FnO1KU9Bfh+aXwue+o6akeU Vk7nb2zwNkuERyQ/OdRXtaDdsntHePn9MFWmb/oeRvEsl8esiyb2ul7I41xioFrnFBhM f4YNHiqi+ezQHXQGUyCtYU5mG1xai4AEER7RCI/BRh2Icir58NAmGFhtrOCQh0zn+e0u C3MKhk8rasKMe/Fr4CATC+udmHfaYOV/5mvt/+0A8VTr6MCbDkfBSHeQ1YTjX7zvE7IB lzbW4LL1A4PVlP8kt5MFiY65Rh+7C3vGMYNOOb2jGYSiCmT9OQe3CxiDGq70cSoWlIxi 7f/w== 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:mime-version:content-transfer-encoding; bh=yZk5ii2zIH0FpjRu2Vo47u1O/jylveEEimlXiUcar7c=; b=pe3WH1r1e3A+piseUr3I2pnzgg8G6sQ33fXyTS3vDhrLNuy9FVcw8CCtDnDKEJScmH spdGnYr25Szb7i2C6SplH8QT0SxkuUW/VVuFwboCSTExZCQKbJrE0eijYhZN4sgpjm8j ejoscebWisjwHUFrp2+QdX/+OjHvFHM7vHOnZdcyUmaUnGW2l0ykQ4/Xo9HprIbcvsLm vS0F/16ls2Lny5TubOZRlGt5itMf8DUUWkYCC8omnl5uMLHK5X2oE2Xsc1vvrFU4YAG8 6S1Tj392k/uBwugQ+lI42gfQvJlC9Cbo8pSLPVCT0ZD9c1yV2HHuEMFdjwQcvWB8GVrX da1Q== X-Gm-Message-State: APjAAAXnhdrE5XeqzqdfweJct4AG3zQRw9B8botROFr1S1amUAym8L8y MRc34WcDi3S7gWB2Pc1p3AVBb4XN X-Google-Smtp-Source: APXvYqy8awTJcw8akWtJt2D2mEt0SvRAFMs+iR4CQzjMBZLQATUxCurE8cShNC92BTM898BrCAT/Hg== X-Received: by 2002:a1c:6707:: with SMTP id b7mr27985560wmc.54.1576454679755; Sun, 15 Dec 2019 16:04:39 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08e23.dynamic.kabel-deutschland.de. [188.192.142.35]) by smtp.gmail.com with ESMTPSA id s1sm19214442wmc.23.2019.12.15.16.04.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Dec 2019 16:04:39 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Dec 2019 01:04:03 +0100 Message-Id: <20191216000418.24707-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191216000418.24707-1-andreas.rheinhardt@gmail.com> References: <20191216000418.24707-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/16] avformat/hlsenc: Fix leak of child AVFormatContext 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" Before ed897633, the hls muxer would free its child AVFormatContexts and reset the pointer to these contexts to NULL immediately afterwards; ed897633 moved the former to later (into a separate function), but kept the resetting, ensuring that the child context leaks. Signed-off-by: Andreas Rheinhardt --- libavformat/hlsenc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 6f36a23cbe..2b87070d62 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2631,7 +2631,6 @@ failed: } ffio_free_dyn_buf(&oc->pb); - vs->avf = NULL; av_free(old_filename); }