From patchwork Wed Jan 1 05:20:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 17109 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 9E30F44AD49 for ; Wed, 1 Jan 2020 07:21:12 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8525768ADDC; Wed, 1 Jan 2020 07:21:12 +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 EDDA868AD9E for ; Wed, 1 Jan 2020 07:21:10 +0200 (EET) Received: by mail-pg1-f196.google.com with SMTP id b9so20252279pgk.12 for ; Tue, 31 Dec 2019 21:21:10 -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=OcY39M5YClDtw3rmuOqeda6o/twJjJK0lL5Vgy3rSMhf21MlXUM0NU5tvcSYH1mHJO LxIq9AzurdTA7Ad2FWgelMlOunUNCYBbOP/2ddDvCkRBsEPxqaKGgDitd3whCdi7jlSh ZMYbAporlzrd3D+UQkE7D0faHFpHLNe44HFgHQclvZKiPUtDE8RW3ams9z2yihZ+++0I pePJYi4CJDi7evGmLoIF5C9TmMxBdQjMDHKtPj+1Renns0NtQchMhyyiAJL/PI2KKwdd uXfwugq35NrqLoTRKEGQZwVNXNFy5MJIks51whDCmuQNtUdRznnYN3P2KJvfl/18nLQq JeyA== 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=ZgUrcbng/ZZjLVQN36mWJWenvAFW+LJZ10Br/UeXETHJz2Tod4dKYyePfDqKHug9Gu J2+JDKvaIllajLlS7Cj3wcGljSqt0QcJ/4DPskIqccDfYTChCx6qhMtzAAkQfIwhFxLL U5qX0mJzwM6+SIRuYbT/CYBOln6EqlL4vPBt93eNsMmpl522KmX8jSTJJp6sLAFeN8Fz CLXBUxCTHDiTD2ev/6Nv2XyzeQsB50sjY0s6bPxSd1FFKv8DD8WLO2AQLms0h6Dx3ZIH zBdBGl6STuXRYbsiuLrSATGsCm3S7VG96bqniC5HtodNQFrUi/dYkVnz/IhGnHQnaXNj iSuw== X-Gm-Message-State: APjAAAVJj1krjZ4fj2TZj6qRTrpPhMfZ0AiEPrf+qmzeYA8ofDEEROE+ nDpU8mxIgGAcwQg60tI+fJk2oSZt X-Google-Smtp-Source: APXvYqyTFmdLb/VIq/8RlG/5Qq/1pspkn99EZVBL/408vddq3Y+I36JwLSYueSeOWTz68OtrxuQLtw== X-Received: by 2002:a62:3703:: with SMTP id e3mr72199583pfa.154.1577856069462; Tue, 31 Dec 2019 21:21:09 -0800 (PST) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id s15sm53908530pgq.4.2019.12.31.21.21.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Dec 2019 21:21:09 -0800 (PST) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Jan 2020 13:20:39 +0800 Message-Id: <1577856040-17409-11-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 11/12] 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);