From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752501AbbDSEFj (ORCPT ); Sun, 19 Apr 2015 00:05:39 -0400 Received: from mail-pd0-f172.google.com ([209.85.192.172]:33226 "EHLO mail-pd0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751847AbbDSEFe (ORCPT ); Sun, 19 Apr 2015 00:05:34 -0400 From: Namhyung Kim To: Arnaldo Carvalho de Melo Cc: Ingo Molnar , Peter Zijlstra , Jiri Olsa , LKML , David Ahern Subject: [PATCH 5/7] perf hists browser: Fix possible memory leak Date: Sun, 19 Apr 2015 13:04:13 +0900 Message-Id: <1429416255-12070-6-git-send-email-namhyung@kernel.org> X-Mailer: git-send-email 2.3.5 In-Reply-To: <1429416255-12070-1-git-send-email-namhyung@kernel.org> References: <1429416255-12070-1-git-send-email-namhyung@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The options array saves strings for each popup menu item. The number of items can be vary according to the currently selected item. So it can leak some memory if it's exited from a small item. Fix it by freeing all items when loop terminates. Signed-off-by: Namhyung Kim --- tools/perf/ui/browsers/hists.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c index 8f303eb5044d..cace2df7e561 100644 --- a/tools/perf/ui/browsers/hists.c +++ b/tools/perf/ui/browsers/hists.c @@ -1691,7 +1691,8 @@ skip_annotation: "Switch to another data file in PWD") > 0) switch_data = nr_options++; add_exit_option: - options[nr_options++] = (char *)"Exit"; + if (asprintf(&options[nr_options], "Exit") > 0) + nr_options++; retry_popup_menu: choice = ui__popup_menu(nr_options, options); @@ -1812,7 +1813,7 @@ out_free_stack: pstack__delete(fstack); out: hist_browser__delete(browser); - free_popup_options(options, nr_options - 1); + free_popup_options(options, ARRAY_SIZE(options)); return key; } -- 2.3.5