linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: tip-bot for Taeung Song <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: tglx@linutronix.de, peterz@infradead.org, wangnan0@huawei.com,
	mingo@kernel.org, treeze.taeung@gmail.com,
	alexander.shishkin@linux.intel.com, acme@redhat.com,
	jolsa@redhat.com, linux-kernel@vger.kernel.org,
	namhyung@kernel.org, hpa@zytor.com, mhiramat@kernel.org
Subject: [tip:perf/core] perf config: Handle NULL at perf_config_set__delete()
Date: Thu, 16 Jun 2016 01:31:05 -0700	[thread overview]
Message-ID: <tip-826424cc919529d6d234af12c6ba975b63528a74@git.kernel.org> (raw)
In-Reply-To: <1465389413-8936-2-git-send-email-treeze.taeung@gmail.com>

Commit-ID:  826424cc919529d6d234af12c6ba975b63528a74
Gitweb:     http://git.kernel.org/tip/826424cc919529d6d234af12c6ba975b63528a74
Author:     Taeung Song <treeze.taeung@gmail.com>
AuthorDate: Wed, 8 Jun 2016 21:36:49 +0900
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Tue, 14 Jun 2016 09:29:53 -0300

perf config: Handle NULL at perf_config_set__delete()

perf_config_set__delete() purge and free the config set that contains
all config key-value pairs.  But if the config set (i.e. 'set' variable
at the function) is NULL, this is wrong so handle it.

Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1465389413-8936-2-git-send-email-treeze.taeung@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/config.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c
index 8749eca..31e09a4 100644
--- a/tools/perf/util/config.c
+++ b/tools/perf/util/config.c
@@ -742,6 +742,9 @@ static void perf_config_set__purge(struct perf_config_set *set)
 
 void perf_config_set__delete(struct perf_config_set *set)
 {
+	if (set == NULL)
+		return;
+
 	perf_config_set__purge(set);
 	free(set);
 }

  reply	other threads:[~2016-06-16  8:31 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-08 12:36 [RFC][PATCH v8 0/5] perf config: Reimplement perf_config() using perf_config_set__inter() Taeung Song
2016-06-08 12:36 ` [BUGFIX][PATCH v8 1/5] perf config: Handle the error about NULL at perf_config_set__delete() Taeung Song
2016-06-16  8:31   ` tip-bot for Taeung Song [this message]
2016-06-08 12:36 ` [PATCH v8 2/5] perf config: Bring declarations about config from util/cache.h to util/config.h Taeung Song
2016-06-09 13:29   ` Arnaldo Carvalho de Melo
2016-06-10  6:20     ` Taeung Song
2016-06-10 19:06       ` Arnaldo Carvalho de Melo
2016-06-11  0:59         ` Taeung Song
2016-06-12  6:28           ` Taeung Song
2016-06-08 12:36 ` [PATCH v8 3/5] perf config: Reimplement perf_config() using perf_config_set__iter() Taeung Song
2016-06-09 13:34   ` Arnaldo Carvalho de Melo
2016-06-10 10:58     ` Taeung Song
2016-06-12  8:57       ` Taeung Song
2016-06-20 10:00         ` [PATCH v8 3/5] perf config: Reimplement perf_config() using perf_config_set__it to Taeung Song
2016-06-09 13:41   ` [PATCH v8 3/5] perf config: Reimplement perf_config() using perf_config_set__iter() Arnaldo Carvalho de Melo
2016-06-10 11:05     ` Taeung Song
2016-06-08 12:36 ` [PATCH v8 4/5] perf config: Use zfree() instead of free() at perf_config_set__delete() Taeung Song
2016-06-09 13:37   ` Arnaldo Carvalho de Melo
2016-06-10 11:03     ` Taeung Song
2016-06-08 12:36 ` [PATCH v8 5/5] perf config: Reimplement show_config() using perf_config_set__iter() Taeung Song

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-826424cc919529d6d234af12c6ba975b63528a74@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=acme@redhat.com \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=hpa@zytor.com \
    --cc=jolsa@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mhiramat@kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    --cc=treeze.taeung@gmail.com \
    --cc=wangnan0@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).