From patchwork Mon Dec 16 00:04:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16816 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 16FB544A07A for ; Mon, 16 Dec 2019 02:04:54 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0711668A9F4; Mon, 16 Dec 2019 02:04:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3A5F668AA15 for ; Mon, 16 Dec 2019 02:04:50 +0200 (EET) Received: by mail-wm1-f65.google.com with SMTP id a5so4837879wmb.0 for ; Sun, 15 Dec 2019 16:04:50 -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=W5c6JZur/a0bwEU9iB8jvNkAbkEVipDnyyAZYcvuKeA=; b=MDvMEWiuzbcMmlDXkufF/QzDkVBkZRchuzo+h7mcbCkRUmLOdW7pa6hVZSWtm4qtxM sZDYFEheHj3rQZStFZpg48fJ3N/0tAl32kP34t8pOORm7xNXsNA4TunajlTvA3aFM14j u1ugC3/ZbtsO2miz/cAooakP/9RNcm2BNqrlCQB057RC87Le9NDkyvkV1yu8rWtWrjAY CrB74BXqC9qor65svgKwlTP/t3YS1J2erjExlAWJPOMiV5n99rf/9mTePjNh0SCmxEtj xHz7/oblUnDyQQZaL9siRkqMf5mXjEjS4X0QLESiLTHSCeYIg5ypnrlu4D9BDj7UN1o3 gdmA== 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=W5c6JZur/a0bwEU9iB8jvNkAbkEVipDnyyAZYcvuKeA=; b=qkSjtZjDh1nEsWRuxt9XTEFKGFWEq5Iwk9LbX2e7RqxzH8WnEuZz6fP1MXHEIfw/59 BanaFY+AYOQaO0PAmeZgHkI+qKSFBnVhZViNh6u8eqJKVpKM2gX8B0ohSWP+Gp4L2Eda FbBGoymusTbxqNVZfuKzewY1nHg190inIJoS25ojfJPz4EIaa5AF1KJdCWp/BYxrpb/I QrW9TW7Kjw3VDLDTn/ejZ2oChsthf9+VAHqsc9LFRn3UkbkPFZ3bejS+zkT8qqIFzToq gduP3esM26m+8KmwX12yMv4ECUZcdLkm3mvaWwG3mqwsNZYeel4zldYfr8q9X6sE90tk Y5kA== X-Gm-Message-State: APjAAAXal1aoiUanVVoJIwzC44+2QcNhyX3wT1HUQxF2wJh1LzrXgMIS q60+pL0rB0A0sZTSqidSFRjeb7Qb X-Google-Smtp-Source: APXvYqzwF1aDSISiiL//p13zJ6mSYa3LzWcyCKyAr7PaWfsMfKKCZ2Z94nVRWN1R0FWM5J7864BgfQ== X-Received: by 2002:a1c:f60f:: with SMTP id w15mr26186570wmc.132.1576454689445; Sun, 15 Dec 2019 16:04:49 -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.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Dec 2019 16:04:49 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Dec 2019 01:04:13 +0100 Message-Id: <20191216000418.24707-12-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 11/16] avformat/hlsenc: Fix memleaks with repeating parameters 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" When a parameter like e.g. language is contained more than once in the part of var_stream_map pertaining to a single VariantStream, the later one just overwrites the pointer to the earlier one, leading to a memleak. This commit changes this by handling the situation gracefully: The earlier string is silently freed first, so that the last one wins. Signed-off-by: Andreas Rheinhardt --- Picky solutions are of course possible, too. libavformat/hlsenc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 669641885e..d5682caaf7 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1941,6 +1941,7 @@ static int parse_variant_stream_mapstring(AVFormatContext *s) while (keyval = av_strtok(varstr, ",", &saveptr2)) { varstr = NULL; if (av_strstart(keyval, "language:", &val)) { + av_free(vs->language); vs->language = av_strdup(val); if (!vs->language) return AVERROR(ENOMEM); @@ -1951,16 +1952,19 @@ static int parse_variant_stream_mapstring(AVFormatContext *s) hls->has_default_key = 1; continue; } else if (av_strstart(keyval, "name:", &val)) { + av_free(vs->varname); vs->varname = av_strdup(val); if (!vs->varname) return AVERROR(ENOMEM); continue; } else if (av_strstart(keyval, "agroup:", &val)) { + av_free(vs->agroup); vs->agroup = av_strdup(val); if (!vs->agroup) return AVERROR(ENOMEM); continue; } else if (av_strstart(keyval, "ccgroup:", &val)) { + av_free(vs->ccgroup); vs->ccgroup = av_strdup(val); if (!vs->ccgroup) return AVERROR(ENOMEM); @@ -2052,14 +2056,17 @@ static int parse_cc_stream_mapstring(AVFormatContext *s) ccstr = NULL; if (av_strstart(keyval, "ccgroup:", &val)) { + av_free(ccs->ccgroup); ccs->ccgroup = av_strdup(val); if (!ccs->ccgroup) return AVERROR(ENOMEM); } else if (av_strstart(keyval, "instreamid:", &val)) { + av_free(ccs->instreamid); ccs->instreamid = av_strdup(val); if (!ccs->instreamid) return AVERROR(ENOMEM); } else if (av_strstart(keyval, "language:", &val)) { + av_free(ccs->language); ccs->language = av_strdup(val); if (!ccs->language) return AVERROR(ENOMEM);