From patchwork Thu Jan 2 11:55:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 17129 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 903E644987A for ; Thu, 2 Jan 2020 13:55:18 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 68C9068AD22; Thu, 2 Jan 2020 13:55:18 +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 E206268ACE4 for ; Thu, 2 Jan 2020 13:55:11 +0200 (EET) Received: by mail-pj1-f68.google.com with SMTP id j11so3163615pjs.1 for ; Thu, 02 Jan 2020 03:55:11 -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; bh=GRqmA0lXZxsz6cvrFBOFvUkPiFGZBRN3ZzAvjjBtUPw=; b=ib7m5XcCESpQ3479wWHoD5mtWlJzBQmIx6usZuzzdSlvgaqOGNeGAzK7yOthTPYUL4 rqsxbe3lwf43dAGxvBtKMnuwrVjhUI8zfNEtnN0zALW/6i/ekZ5V6Pw8fdvlQccCR7db 5uhbpEgYRKHuKvsBO1PEQZGb5VZiK9iz4eLI10/Ul5r6jOHExgZBrGOCh6t/NOJXcxBm ReZecz9ofk5pQSRB8dN1NcnSyVnraAN3L6hpxBg1cXLtwcSH4jLIpPPp5mHraDdJZgOE go+EGTJjuKCBb2ahggZzLh7VIeio9kHX14tsXqrA7/AMqYHLhJ0I2NitfKFammxWcdMH XxoA== 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; bh=GRqmA0lXZxsz6cvrFBOFvUkPiFGZBRN3ZzAvjjBtUPw=; b=qlRJhJDNoKmJ9RIxPE+xpg3H1/Azn8udZwmKvqC8lmhW6q+7Okr95lP1YgwY28MOah M8owyoJ7mjpKlrtbh/LRBvWbpQViffPsVyyjMMF8Hs/s7vsugOHgecDaEcTApIMDXQtg clay7DCXy22A2kbsbFSyELnUD73IExG0Dv0xgIM/PUPXd8BZcmrgjVdxHETDDDNmOy5n DbG7cCHNFNQ3GpbgfWhb2aM9YxQTdZfEq/k5MX+rZ/2Z78Q2vjzgh+z3WNKaJsPfhIYf E7JzlN3jeY9iNLvPP6WsOt5w1GNt/6KP3pf39AYXjpR9NuVrcwJcq8M5GL68lzj+abL8 Dp6A== X-Gm-Message-State: APjAAAX+9RJNMILoa/Egl5uwm5L/K3XovdQ1YXmJqww9+tZ02GYweYb+ 1RDNShOXwlyxPl1D9kHhUocr+bRp X-Google-Smtp-Source: APXvYqxy9jfeDxKKXi8eXll8ezUaCC0bQwfGgRUqeYvOjcY0gn35BizQ9BfXPudNqiFpewJ8lbw00w== X-Received: by 2002:a17:90a:8a12:: with SMTP id w18mr19168800pjn.68.1577966109805; Thu, 02 Jan 2020 03:55:09 -0800 (PST) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id y76sm66267524pfc.87.2020.01.02.03.55.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Jan 2020 03:55:08 -0800 (PST) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Jan 2020 19:55:01 +0800 Message-Id: <1577966105-4642-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 Subject: [FFmpeg-devel] [PATCH V2 1/5] lavc/bsf: 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 --- libavcodec/bsf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavcodec/bsf.c b/libavcodec/bsf.c index c1653cd..8e1af60 100644 --- a/libavcodec/bsf.c +++ b/libavcodec/bsf.c @@ -517,8 +517,8 @@ static int bsf_parse_single(const char *str, AVBSFList *bsf_lst) ret = av_bsf_list_append2(bsf_lst, bsf_name, &bsf_options); - av_dict_free(&bsf_options); end: + av_dict_free(&bsf_options); av_free(buf); return ret; } From patchwork Thu Jan 2 11:55:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 17130 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 95CFF44987A for ; Thu, 2 Jan 2020 13:55:21 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7F46168A24C; Thu, 2 Jan 2020 13:55:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 10D7568AD71 for ; Thu, 2 Jan 2020 13:55:14 +0200 (EET) Received: by mail-pl1-f196.google.com with SMTP id bd4so17737937plb.8 for ; Thu, 02 Jan 2020 03:55:13 -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=xW91GX5xTyoTtDayWVhcJft9wjBK1VCWwyEydMBqiwo=; b=vIOFkIcwt7TFbECxuFWYmF8Q0s8Z+wmIljLCeFrDjDYsPoBT9aST/gLMNzMuNv2fw7 Y9BSXRto9m+H/G8ZzLJX0Q1BJebTNlEk9YS+96/N+DLBhkCgDqC/ZYQHXFrh6W0gYKQu Z3v3F8doHe4m1rTiIywK3XMIWTzFq6ZZotWNEpDJQx0LqIVKqovc2/Lq4tfcNIdmDUt3 4wVgfE8/xa2Tm9u767YOKjD0Am0fxGdhkubu7icm+FmWxEmUpFZLUwsZxdeNaDjKe44D YeFlwQinioV7JIve9CHuw3zTL2kXinVWHMy6fsmu6lqPS+IxH6VlXVg17HTWAuU9ysRI HLyw== 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=xW91GX5xTyoTtDayWVhcJft9wjBK1VCWwyEydMBqiwo=; b=o4H9SO0EhubEX1xdmtmeqAgVgPPgQKVzGq8Dxzd7RvaGCCRb+S+U9kZJElu166ebGI rYc5NfjDTuT2O7yWshx0/brZ9G9XbQBjgVIYPFhAUtXvO8gRboQOUeiSI9GkP1wGk0ZI 9K8fMtOgAjfRuH4vcmZisJI8JC3qTqWt0Prj28k0Dh2EJIjMqrnteIJykl7mFPGvKShH eIzo1Bh2tOzHwaTuJT/1V0WjaiDunsAm5Mt/HrGq8pNINb/xTnoH0zY7zBGt+wG5acOr BHXW5kO0XQdR4oVgh3zjwzr/Q/vzG0LAMRWtpKFeo5HE9/npmUpSMR18T1s38OPbgyBo XrGQ== X-Gm-Message-State: APjAAAW9nUYrcwqU7d8MWRpESNEbR+Y50mLa+DJxCcamNE/I1kG4sDj8 KoBOSbI2HpyyPXF3/pZnYd2wH0Uu X-Google-Smtp-Source: APXvYqwKaJ4kJsdlsoOn9J7wCNiq+pFx+3nKWVsqYvciz4MAOZYdIcOM7vJcIZrDBotCduVI7b+8Sw== X-Received: by 2002:a17:902:b087:: with SMTP id p7mr87376702plr.10.1577966112196; Thu, 02 Jan 2020 03:55:12 -0800 (PST) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id y76sm66267524pfc.87.2020.01.02.03.55.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Jan 2020 03:55:11 -0800 (PST) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Jan 2020 19:55:02 +0800 Message-Id: <1577966105-4642-2-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 2/5] lavc/libkvazaar: 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 --- libavcodec/libkvazaar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavcodec/libkvazaar.c b/libavcodec/libkvazaar.c index a89ca7f..02bcae3 100644 --- a/libavcodec/libkvazaar.c +++ b/libavcodec/libkvazaar.c @@ -110,8 +110,8 @@ static av_cold int libkvazaar_init(AVCodecContext *avctx) entry->key, entry->value); } } - av_dict_free(&dict); } + av_dict_free(&dict); } ctx->encoder = enc = api->encoder_open(cfg); From patchwork Thu Jan 2 11:55:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 17131 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 6F73A44987A for ; Thu, 2 Jan 2020 13:55:22 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5B0A068AD93; Thu, 2 Jan 2020 13:55:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D337D68AD48 for ; Thu, 2 Jan 2020 13:55:15 +0200 (EET) Received: by mail-pl1-f193.google.com with SMTP id g6so17748233plt.2 for ; Thu, 02 Jan 2020 03:55:15 -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=6yrvcVgj5eYj0o5o9xkEW6Hocjay229traSW8D8SlhM=; b=KvJLTkXSdv4UQSBh8mXM/C9x3I2kB3UW5GYEtdRUulF0b5pM97/hqo3t6b+N2nLB8G Q3jlUz+E7udHmixUbmtpzssUbTyOYbaT+0Q+tFCIdDzlO5GvR1h/L9+IAq/Vhfa0R1EU wvwP1jw9h61i6EmrgMIcGYwsZARMjh5xB6gJ2OkBhyxoToNK9+b7kNkLd0eDpTQP7M98 1MgcxmK3GD1KzyiWI1iskEKdmHSN/rrrN9LhrFWpInmjbiqxQGcgeTQkQd/aSTQSAZ83 wcX9OCZPSqhtanIeSGK9/yvicJ9CyXmSGi0YM1ZIO+Zs9K6nmlWbE2jjoui88MG6ls98 A8hw== 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=6yrvcVgj5eYj0o5o9xkEW6Hocjay229traSW8D8SlhM=; b=Wn1aY5Rcazelg9jl1+BQ/EuwudDG2u7EFr8CLxmcdwxd6Bq24HFzEV31jO2S6RJexH vwr8LqjS13x5Q++Ko9hCvbWfgb7oFNj4UG0GQK57wKdFSLzU9VU3FziGMtNh5srcUz/3 zsFzzwNfqqKuo/cQwY6UA3RkzJpS91AtaTYIhbBfZLaLmUiFkAMbAo+q5kADQ+VfG+mK Ae7TFJE4EC+CrevrVQzaBTH/5amNxaQ9+NdM1A3DyPrJlfRRoxrv1rwpCzcnB8DUS6pN lHNxrPAPiicfY8JjxTbCnnPb8Ps+WEdJ+PXPeQaAi5y1Z2WYyOwhQX2YI4zTtSgo0LK/ hfqg== X-Gm-Message-State: APjAAAW1wq03AMsPs5C2NF3e9BEPZJdpC1PJcbgtCtqlpI4JDojrK6LJ FKQKwCdQeijw+wQsKt65+p0rkTpR X-Google-Smtp-Source: APXvYqyo/QSzdpVw47TBy3BmPA8teV9ENdfhWffnYel+x3Kl/P2dl5cXwQTybHI8IsXXs/GZ/9c33Q== X-Received: by 2002:a17:90a:bd10:: with SMTP id y16mr19415464pjr.108.1577966114282; Thu, 02 Jan 2020 03:55:14 -0800 (PST) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id y76sm66267524pfc.87.2020.01.02.03.55.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Jan 2020 03:55:13 -0800 (PST) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Jan 2020 19:55:03 +0800 Message-Id: <1577966105-4642-3-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 3/5] lavfi/coreimage: 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 --- libavfilter/vf_coreimage.m | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libavfilter/vf_coreimage.m b/libavfilter/vf_coreimage.m index 323a28c..4ed5ba7 100644 --- a/libavfilter/vf_coreimage.m +++ b/libavfilter/vf_coreimage.m @@ -486,6 +486,7 @@ static av_cold int init(AVFilterContext *fctx) av_log(ctx, AV_LOG_DEBUG, "Filter_string: %s\n", ctx->filter_string); ret = av_dict_parse_string(&filter_dict, ctx->filter_string, "@", "#", AV_DICT_MULTIKEY); // parse filter_name:all_filter_options if (ret) { + av_dict_free(&filter_dict); av_log(ctx, AV_LOG_ERROR, "Parsing of filters failed.\n"); return AVERROR(EIO); } @@ -507,6 +508,7 @@ static av_cold int init(AVFilterContext *fctx) if (strncmp(f->value, "default", 7)) { // not default ret = av_dict_parse_string(&filter_options, f->value, "=", "@", 0); // parse option_name:option_value if (ret) { + av_dict_free(&filter_options); av_log(ctx, AV_LOG_ERROR, "Parsing of filter options for \"%s\" failed.\n", f->key); return AVERROR(EIO); } 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); 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);