From patchwork Thu Jan 2 11:55:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 17133 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 3D85D44987A for ; Thu, 2 Jan 2020 13:55:26 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 282DF68ADCE; Thu, 2 Jan 2020 13:55:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D2CA568ADC6 for ; Thu, 2 Jan 2020 13:55:19 +0200 (EET) Received: by mail-pg1-f196.google.com with SMTP id 6so21788543pgk.0 for ; Thu, 02 Jan 2020 03:55:19 -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=XQeDoQ8Ib7JotgXYJxszdlNIkMqnlmZa8PELF5R5g/s=; b=ZcWTvlMpxklxR5DgKs/4UrvTWqSmpEbnLhVKRvpv/wIvObubS+kBeap6c5GI/9J6UQ z55JzVWfq3HrkaNEg7RccBQkmrMdkUoPGuCWAembPS4eA8IsQc3wRvzzv32tStBM73iI y6Dx/M06SjRgEcQFL0wtmERM1XxUQuORQWBR0fxqaWmgzBIhERZQMHXpbzP/4nPX3erk rtA8BjpnVwi1aaKwjvzkzxqJsk8kDOzMv87iMG2Tay/4ZnBltlWZ+WX5XaQOPfXgNmbO 3yTb42gIxPF0MJKEqvp/3ioH63LVkWbaWgazZFXcVixyKFDySGgXivUc/MWtP1RDh4qJ xsng== 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=XQeDoQ8Ib7JotgXYJxszdlNIkMqnlmZa8PELF5R5g/s=; b=QaPMuARnyEvWiyOppvevxzNMeFdzOpd4oHxx6twmNFzsxox+zt151SsByWT7bE8blt OBP3FPdGv5IFCyjPN54kd0OSGMv96F9GMclNwJcp78iiEH2PflfiCC4Oc32aldgda6iA 7BF6fRJlRvobss2otT8lKP9Tyieu3kvEIQGHD/GHN41G7qVkCb6hsQ+mOJWA/fKAotAU V0Kf5Yr8tOA6G1nJmLtms1uOlH52zj2iQFODRycitkHETYYKcosga3Vd3L5d4HCpDv0T EXv/qT83c9mLRMg53tknY9xdRmTLyrkKrzqYnitQi7P0s5f1QeFeuww7DFjq0bvDg8NR us6g== X-Gm-Message-State: APjAAAWOpN8IkYJEdW2W264obGXrZRg8NNVyqZojXuX0fSWzT9SEanLw O7t02m8qVRqKtAwQxeITcsMUOMXg X-Google-Smtp-Source: APXvYqzNgMDLQ2uxGgEmF6FyjhdFI7XHIDcwKrLSci6+wx20JlmXhp8EI4P92/Bt2A8aulTQ+lvtEw== X-Received: by 2002:a63:5203:: with SMTP id g3mr85871323pgb.377.1577966118240; Thu, 02 Jan 2020 03:55:18 -0800 (PST) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id y76sm66267524pfc.87.2020.01.02.03.55.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Jan 2020 03:55:17 -0800 (PST) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Jan 2020 19:55:05 +0800 Message-Id: <1577966105-4642-5-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1577966105-4642-1-git-send-email-mypopydev@gmail.com> References: <1577966105-4642-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH V2 5/5] tools/aviocat: 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 --- tools/aviocat.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/aviocat.c b/tools/aviocat.c index 816ab70..0fdf39b 100644 --- a/tools/aviocat.c +++ b/tools/aviocat.c @@ -53,6 +53,7 @@ int main(int argc, char **argv) i++; } else if (!strcmp(argv[i], "-oi") && i + 1 < argc) { if (av_dict_parse_string(&in_opts, argv[i + 1], "=", ":", 0) < 0) { + av_dict_free(&in_opts); fprintf(stderr, "Cannot parse option string %s\n", argv[i + 1]); return usage(argv[0], 1); @@ -60,6 +61,7 @@ int main(int argc, char **argv) i++; } else if (!strcmp(argv[i], "-oo") && i + 1 < argc) { if (av_dict_parse_string(&out_opts, argv[i + 1], "=", ":", 0) < 0) { + av_dict_free(&out_opts); fprintf(stderr, "Cannot parse option string %s\n", argv[i + 1]); return usage(argv[0], 1);