From patchwork Fri Feb 28 09:53:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17957 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a05:6214:1865:0:0:0:0 with SMTP id eh5csp1913051qvb; Fri, 28 Feb 2020 01:54:17 -0800 (PST) X-Google-Smtp-Source: APXvYqwbqbnZBIcWKCLWutcWTre3LRUdj8JE4CzHmQELnQsMxU4gsnrrYIVS1wVyr3l5JfNyLVY8 X-Received: by 2002:a05:6402:1ac4:: with SMTP id ba4mr3402890edb.201.1582883657639; Fri, 28 Feb 2020 01:54:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582883657; cv=none; d=google.com; s=arc-20160816; b=g7xBCdWWSeq2u6+sqig0U1uZhU4dYIIHWSFplFh9qOBq5XRTasuOY1X+bUHU1JE8cW Fr4AHqrNgkyPrxY18TRY0wg+NMCaehaUIuxVDn3eqkEJrC1UaW3mT6sJnEqQiirya/cE mrVonQ+doser44gkMXKjJg56q9QRkWxbALYLAcOoKZrthNCNfY6VcNebycs0HOdWuD2b 34Tzc33nJDJ5hWlFoLYRLpZeJSCyRBQkqdihHNGDg4+ZFhW6cTSx/1aFjRwqz6MhzoNF Y+JV4tH+IvjI4dYmE29mO17bN5UURtmgsY8oviDZIpbBFI8MqCxzhqsEaB31CwKfwqhR OYPA== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=ajg4gio/XRZFsyR3l0eY6cjYGNnPy8HMqLV5ITMxEtg=; b=ACe4UagrkA161pFf1H8sSjGB+N0qiyoK6662+v898rvTDxmN1of9PDwGwv7zJd7/uk 08QQ2k/X/tZ8r0QgLlBn20dPbz9G41D/wUKYVhY1EpWlwnPEFzt/6iRqqw+U3W0qUU4y CeFvlNi/KT/pMJhWOzQGuyT09gLOMzKT3LK5KILFwfM9MmaC9tB3LfFZYCO4XakqBGzX vfs733rvDHXUjeeTQ4qJCdC9OifJIhDjHIm4vM8CpNMBXC/8MPZkNzwbWtRatbjyfKdZ Smpg0pM6ZdYcBt/u6JiXHtSfnD6VktcNS6AxgMKwulwfoYbA8tx3dRWC5ohUv2P33yKR yGDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=RgDua0w8; 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 y22si1497948edw.131.2020.02.28.01.54.17; Fri, 28 Feb 2020 01:54:17 -0800 (PST) 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=RgDua0w8; 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 F27E468B52F; Fri, 28 Feb 2020 11:54:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2646768B4D4 for ; Fri, 28 Feb 2020 11:53:54 +0200 (EET) Received: by mail-wm1-f67.google.com with SMTP id z12so2501048wmi.4 for ; Fri, 28 Feb 2020 01:53:54 -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=n+167G0dZVVpGkVO7eBuEsPP0NZmPnmWmoEIKX6r+YU=; b=RgDua0w8ae6r3MyJ3ftLe5xcIO8gyCa54iXarfyCpZKTgujMjWB+ZeT8QhYeNTQHIx d/NApxXyjr1WTS43geGeMBacPvqknfv1498+6ELeQALAf2Tgmkmo7l3DgkLb1QYKApeO G4EWsmVfzW5yzcP7Bn+oUz0GhqbTC7NKei/W+PjbHnQVaGHVnLaobQjWMGgy9ARx65PT ooMDXziV0ZTvOYuCQVvJQdMEndLEbjTP+pncg4mLzYCYongzTUoS6K56wLTbUVxHOO7t 31QDacf3qHQMcjOSy4whNFBQx3wbcF+n+MSmKGDpnr2rdI5c6658wGxIBvWWGkWAhPR2 LxVQ== 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=n+167G0dZVVpGkVO7eBuEsPP0NZmPnmWmoEIKX6r+YU=; b=mBK1CG/N9ATLexADFtCDy8+pgkYSqQgQ+70rVsGZAV+v2Z2lHJLGZPRPb6tDx9Saoa jjBEarCt+NR5TAdfbdPoKlyTpbeaVGk/ROAwWGBEYDDjt526BwFOTJE7tYEQ63Z60Utd p4++OJqZErFJg2CqkrXlOrZnb0jj2PNqhMAqG71stvrEEVH0gaRgRRuD6KVGdnurJz2+ fdcs5CCML92JpwIsUw/wqZ8RnRQXxmy2MTtaEuMZe70VF50IOhykfyHUPN+ifdNHBxHO 7OrYk3EMPFGEMlIlH2c8T5W49vHL04a9LARJun1CppKkMZ2w7dBRWyDlW/Pc8xR6WKJN WwyQ== X-Gm-Message-State: APjAAAWUzPw2Q5FAhKxnS/MZP2P5p493WyC9jxBgdMSOFIJ/HTz7S6Wz CSUviFUvU7sQMAhONAFk8VAWUTfM X-Received: by 2002:a1c:ac46:: with SMTP id v67mr3896164wme.153.1582883633390; Fri, 28 Feb 2020 01:53:53 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1ab4b.dynamic.kabel-deutschland.de. [188.193.171.75]) by smtp.gmail.com with ESMTPSA id c8sm1453360wru.7.2020.02.28.01.53.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Feb 2020 01:53:52 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 28 Feb 2020 10:53:18 +0100 Message-Id: <20200228095321.7222-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200228095321.7222-1-andreas.rheinhardt@gmail.com> References: <20200228095321.7222-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 4/7] avformat/hlsenc: Unconditionally free some strings 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" X-TUID: m/T6tWyoWIRU Content-Length: 2140 hls_init() would at first allocate the vtt_basename string, then allocate the vtt_m3u8_name string followed by several operations that may fail and then open the subtitles' output context. Yet upon freeing, these strings were only freed when the subtitles' output context existed, ensuring that they leak if something goes wrong between their allocation and the opening of the subtitles' output context. So drop the check for whether this output context exists. Signed-off-by: Andreas Rheinhardt --- libavformat/hlsenc.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 18f40ff3ed..4628ea15c7 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2496,12 +2496,10 @@ static void hls_deinit(AVFormatContext *s) av_freep(&vs->basename); av_freep(&vs->base_output_dirname); av_freep(&vs->fmp4_init_filename); - if (vtt_oc) { - av_freep(&vs->vtt_basename); - av_freep(&vs->vtt_m3u8_name); - avformat_free_context(vtt_oc); - } + av_freep(&vs->vtt_basename); + av_freep(&vs->vtt_m3u8_name); + avformat_free_context(vtt_oc); avformat_free_context(vs->avf); hls_free_segments(vs->segments);