From patchwork Wed Jan 1 05:20:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 17136 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a05:6214:1865:0:0:0:0 with SMTP id eh5csp440830qvb; Tue, 31 Dec 2019 21:21:42 -0800 (PST) X-Google-Smtp-Source: APXvYqxexTyuAyEjDrZ+HqIqtX3cu89swLO/ixw1oWhJLC8XbEX5rr5Z78x/C2WOs3CqY5aCMFut X-Received: by 2002:a17:906:9501:: with SMTP id u1mr78214189ejx.113.1577856102253; Tue, 31 Dec 2019 21:21:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577856102; cv=none; d=google.com; s=arc-20160816; b=qU1LnQTU35ZFJhssICCNEBeDuqsyPYz0AT8oDCyferrT+sQB5k/2i8q6N0s/qmS8Fc oC7i9jCu/ApqKIHjerEi+Nq7WOIQ84Zca8zSlri0D0oMYiSHz0jT7zDSAh2Kj1lNkDxz oqCXrBEFLVhBGZfVB5TjCPkRDQWXBmhT/RMQ1KLlfkqtS+COULqRDPHVB0aETy23SCFt Bo3YoHpX0hTtKC1QiQJekrgxZcfchIHu5sQPPdFOPJ8EVTPg41ardguKFtU2/XXUEAWv 1wljxZYIkZ1hyGLac0gXbvhkYhMC0xG8wH5A3SGqbfFaE6Dj2rRZL4SUIuWZ2XcDgYT5 S7VA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=bcJPUKLxs16dMAH06GKsr7pyMRxz8dN2XIDEFcSxzKA=; b=i9c5CyJFYLiKJqlXMcEao6PVxuPuvjBEuw9nuod61MUOHFi4nbSi5WZuMQnjW2vAJp RtGQjWKz9wGqjCFiYOz4dKcoYFO1I/q+09Ia4YGr5+lgv6N+pUg2qunYlWIvx5+ftcn1 yQnivtsS+F2c6i+PoARJX5Q/Gf+0qqNm/xJoWz8Uph/3sJMYjc7sWizT9KwaWYe4JaRO MGszeeeML4RfYvnFBDDLm0beTAl2OJJPxo8Zdo6pTuZgnPwOt8FxP+0G9q2Gu+K5AGQ1 uHkzzqTQulvhfda+dQE/6KiR/1Sff88hEb6cpU0gf6ud1W6IVfTCyW3LcJhQXlEumR5W iiIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=t9jRLhyN; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f12si33335867eje.429.2019.12.31.21.21.41; Tue, 31 Dec 2019 21:21:42 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=t9jRLhyN; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 83B6268AD83; Wed, 1 Jan 2020 07:21:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f68.google.com (mail-pj1-f68.google.com [209.85.216.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2638868AD1B for ; Wed, 1 Jan 2020 07:21:00 +0200 (EET) Received: by mail-pj1-f68.google.com with SMTP id r67so1836487pjb.0 for ; Tue, 31 Dec 2019 21:21:00 -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=bjgg2r7PPGhkgpHTqiLFWb5wvkke0iWMDDGNbDtmx2E=; b=t9jRLhyNTvUGC/a7WeZBLqDPKT1ftIo91u6g74h2n4uEVwgfVFwKURro9EFSTKat9f AmjayNt/8GSFwPlqAcTIdBn7yCruHs3IZ4VT9VcyRCNsTz1wxS9z56pOElFdDHwSqNq6 8UuK5srraixNis6hT6gAYpCtOPH2qjbHmoVtWFuNDX7kMvuwe5wFr0JkIpfntwrAgw0o gnkoGrFIlLuybFeXzQbAonTOrgq+OMLC/k8h++ymq9wLOUS6Eri3wtld75jqf51CrriK jU/6vO08TUy3/sgj61aBVf5oNYpUy/aQH/YLf7t+Mi5Aa/7b0Da7vYQt+fMx/pq2Jpsk 9VPw== 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=bjgg2r7PPGhkgpHTqiLFWb5wvkke0iWMDDGNbDtmx2E=; b=Jxr0muhkUUxGv0OUdKX+Qoi2R49qMAV3t5XhcIz5KIuvUE2tEOXtfZX0iE+EtpTptB 85bhzvszXiynljCeS0sfN3JLL9dxLDXrg24JfXOu+A2Oo3V8277aCv3H6Y4MVOx2Pxr9 AlxyEpPMgdaDmW48sTyBaCiKo4XUaf14q5AZVIGEC+4FKBDX596kifkg/DdXu8nWxYmm FZWJSzXOjvZ8jhIJTUJlCpWybUpYFw2bbkQ0rAvGRkrm8tS+4DM+D13rubkehrPTC1RK gV/rkZPRHg9x12mpGH+H8JNXqTYTdsiE5x1M8j0FARyIz/aBgjs4UNnAXh7nEK0vzML6 tWiw== X-Gm-Message-State: APjAAAWpOGwchQlUGuyv+GoL5YcrMPcDRnSjmdWmv7nEwoPDSJpdnr6q wsRbKl/+b4da1AkGaVrHWaGW1WGY X-Received: by 2002:a17:902:8d83:: with SMTP id v3mr75249910plo.282.1577856058440; Tue, 31 Dec 2019 21:20:58 -0800 (PST) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id s15sm53908530pgq.4.2019.12.31.21.20.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Dec 2019 21:20:58 -0800 (PST) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Jan 2020 13:20:34 +0800 Message-Id: <1577856040-17409-6-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 06/12] lavc/libx265: 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" X-TUID: lCR3K6yXNAbW Content-Length: 1403 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 --- libavcodec/libx265.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 963c28f..3836049 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -262,8 +262,8 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx) break; } } - av_dict_free(&dict); } + av_dict_free(&dict); } if (ctx->params->rc.vbvBufferSize && avctx->rc_initial_buffer_occupancy > 1000 &&