From patchwork Thu Jan 2 11:55:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 17132 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 57D1944987A for ; Thu, 2 Jan 2020 13:55:24 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 41C6468ADB0; Thu, 2 Jan 2020 13:55:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A084068AD9C for ; Thu, 2 Jan 2020 13:55:17 +0200 (EET) Received: by mail-pl1-f194.google.com with SMTP id s21so15000113plr.7 for ; Thu, 02 Jan 2020 03:55:17 -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=zJDZsbzcqEXcxA306rLsOYjopcomEiNzG2XIgcMMNxU=; b=JExjM0sQmPTTqURKqXdZMOCmjm+0JJI29EJSrX7RVkZEz4nffNI6z+45arN/jDKRQN y7UNdLa43oXiz82wu5jklNeynzWF+jMKPp0HpNX06PyoPAvvn/ZILkvMKUOPzE/PrOma hunCA23qFCeMi/u1lV0vE0SVX6wD8CHO5d+++NGDVtFFrntzXj383GUyRzwe1EDSNnQO 4iz8kau5dwLL1YNVOqNJs6vIvXgZY4D6BcI/TQWEiUfFdftyfWet+jpF+C/rOU3cGZ+r fmuMqOEobZ9qFXnDlmSFeZdGQc080pfHi+7+G7Nhb22b82akLu91Q14VWnL5pjL3/hm5 3PQw== 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=zJDZsbzcqEXcxA306rLsOYjopcomEiNzG2XIgcMMNxU=; b=FDtz1XKOoyVpq9TihOFwcnI+tmUUkdEkVCJ4SekcGB0h/ggFIlBVhnhwtj2zWrfXt+ YQwuJ9BIkZfIiLPJMkVKaJkeWDwWUeDaOCZS3BiiyK3zZCrhsK1MbaxpHMXcLUQbJZ0i ZcXFVyl1omd4/VSjzkYKYySIVZfOT4s/Gi1TSsh1M5mmgsX3IOglwTz6uuhVxY3hgip2 ysePD7zkTGX5NamcZHc0sayKz7nXm3B7Q6B2ihn329ha1jNr1nhti8JFvzl9N8drDQLF U3g+pWMGoN7v/xmyYmYAWeRJN2nmggbkunc++gUMat4geINf2HbAtf7YdWrvkeOsv3QR 3x7g== X-Gm-Message-State: APjAAAV+IgyYDkdoEc3nwLcvF7e0GX0mO02WJieYVvbcL7hr9vtnuC/r PiHEKU4kFl36rFHgvPdq9OnbcDle X-Google-Smtp-Source: APXvYqzPZ3yRNiWbMhdSHdicA6IEHjzQ1wA/4EcfdsrRtbdCZ6yGQFXkIEhWbTJkcJse3kItHH1rww== X-Received: by 2002:a17:90a:1a50:: with SMTP id 16mr19826891pjl.14.1577966116035; Thu, 02 Jan 2020 03:55:16 -0800 (PST) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id y76sm66267524pfc.87.2020.01.02.03.55.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Jan 2020 03:55:15 -0800 (PST) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Jan 2020 19:55:04 +0800 Message-Id: <1577966105-4642-4-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 4/5] libavutil/opt: 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 --- libavutil/opt.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index 60161d4..a482feb 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -452,8 +452,10 @@ static int set_string_dict(void *obj, const AVOption *o, const char *val, uint8_ if (val) { int ret = av_dict_parse_string(&options, val, "=", ":", 0); - if (ret < 0) + if (ret < 0) { + av_dict_free(&options); return ret; + } } av_dict_free((AVDictionary **)dst); @@ -2006,8 +2008,10 @@ int av_opt_is_set_to_default(void *obj, const AVOption *o) AVDictionaryEntry *en1 = NULL; AVDictionaryEntry *en2 = NULL; ret = av_dict_parse_string(&dict1, o->default_val.str, "=", ":", 0); - if (ret < 0) + if (ret < 0) { + av_dict_free(&dict1); return ret; + } do { en1 = av_dict_get(dict1, "", en1, AV_DICT_IGNORE_SUFFIX); en2 = av_dict_get(dict2, "", en2, AV_DICT_IGNORE_SUFFIX);