From patchwork Wed Jan 1 05:20:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 17108 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 983E944AD49 for ; Wed, 1 Jan 2020 07:21:11 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 81B2C68AD9E; Wed, 1 Jan 2020 07:21:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 20C3468AD92 for ; Wed, 1 Jan 2020 07:21:08 +0200 (EET) Received: by mail-pg1-f193.google.com with SMTP id q127so20276328pga.4 for ; Tue, 31 Dec 2019 21:21:08 -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; bh=TJIS7CeISB0OArKyD5SLYgVFQCouKwtuQ/qdDFcLJAA=; b=vO7N+py7oPiah7kDUlnR3cKcrI0aYYgVVOdeTAQKYCOtzWVsvI2bh33cQdLErdED9U yXzoYBSdF1MksEud3Yn57toMy+Yn1x3u1pYPJwDa5pf5O2OAcN8R+LxA1qlmiDRpI71O g8zSXQVyJ1a0/Diy7JPSxHbte8CTP8SF1E+9bFUu9joutFlN2w8etlSdOxfNbXQ7Sg1n pZP2CUSIlQVOSc00uzCOabs0nuMfPV65LFcaRyhJPqlNjGKWTjMEBGs50jlXAT2sUvM/ kFsAp9k2Jp+AraXO/SKG/mFgxJlQU/t2iiifoZSJ+Auc85Bhu2dKFQyCAEPJyut9jn1O obWw== 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; bh=TJIS7CeISB0OArKyD5SLYgVFQCouKwtuQ/qdDFcLJAA=; b=R+lkOOS74IgwNUfHRFaxHtwn7Uh+Ygo1RCpd//YKOwqEzQIAJgykslk6zQnxRw5wp0 0bTtw9UwKKdZp78iKh8P64IxftRKEg0dv9yAjbfE8OpV0Fd3n0+WYUMh/jBvxEf/F9vG l2ENf+xESdaMJ5qd8NUtpTI7g0YFftJy9Xnl5DdmFnoRv/PmNtat+54GZhrJPwuw7oxj 5yaXUYqvRj9/yy534qIaZfgzvhTUARDZ7SIRPUQauGv0b/w/68GHngZrt8H17QOuVeep PjWMKSUUb9poCun9D1M9cv2h5VvZcaM6/hc7BZrZSBF4YrpPX8+UF8+zeRt/5/HWWuj7 jJWA== X-Gm-Message-State: APjAAAU83VnnDjJQbLhljA4XtPW+jKbDI0m/n5dZkTwjiY9aXjXcLWvz Te2SRj5T2mflBa//ocmeooeNRsQF X-Google-Smtp-Source: APXvYqzljHtSVX1by2aEp/b+7uRoGV90AoY+hH0pDxayyZ+R6xzIZQny5skdhYRojJxgqakBxH9IdA== X-Received: by 2002:a63:3dc6:: with SMTP id k189mr80727941pga.396.1577856067382; Tue, 31 Dec 2019 21:21:07 -0800 (PST) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id s15sm53908530pgq.4.2019.12.31.21.21.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Dec 2019 21:21:07 -0800 (PST) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Jan 2020 13:20:38 +0800 Message-Id: <1577856040-17409-10-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1577856040-17409-1-git-send-email-mypopydev@gmail.com> References: <1577856040-17409-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH V1 10/12] lavf/hlsenc: fix memory leak after av_dict_parse_string fail 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao In case of failure, all the successfully set entries are stored in *pm. We need to manually free the created dictionary to avoid memory leak. Signed-off-by: Jun Zhao --- libavformat/hlsenc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 6551e1c..df19545 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -856,6 +856,7 @@ static int hls_mux_init(AVFormatContext *s, VariantStream *vs) if (hls->format_options_str) { ret = av_dict_parse_string(&hls->format_options, hls->format_options_str, "=", ":", 0); if (ret < 0) { + av_dict_free(&hls->format_options); av_log(s, AV_LOG_ERROR, "Could not parse format options list '%s'\n", hls->format_options_str); return ret; @@ -2781,6 +2782,7 @@ static int hls_init(AVFormatContext *s) if (hls->format_options_str) { ret = av_dict_parse_string(&hls->format_options, hls->format_options_str, "=", ":", 0); if (ret < 0) { + av_dict_free(&hls->format_options); av_log(s, AV_LOG_ERROR, "Could not parse format options list '%s'\n", hls->format_options_str); goto fail; }