perf config: Handle the error when config set is NULL at collect_config()
authorTaeung Song <treeze.taeung@gmail.com>
Mon, 6 Jun 2016 10:52:54 +0000 (19:52 +0900)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 6 Jun 2016 20:43:19 +0000 (17:43 -0300)
collect_config() collect all config key-value pairs from config files
and put each config info in config set.  But if config set (i.e. 'set'
variable at collect_config()) 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>
Link: http://lkml.kernel.org/r/1465210380-26749-4-git-send-email-treeze.taeung@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/util/config.c

index b50073741b80e91387b333f063a0a46f38c563b9..c73f1c4d1ca93c52170120f9fdafdc2983e5af48 100644 (file)
@@ -607,8 +607,12 @@ static int collect_config(const char *var, const char *value,
        struct perf_config_section *section = NULL;
        struct perf_config_item *item = NULL;
        struct perf_config_set *set = perf_config_set;
-       struct list_head *sections = &set->sections;
+       struct list_head *sections;
 
+       if (set == NULL)
+               return -1;
+
+       sections = &set->sections;
        key = ptr = strdup(var);
        if (!key) {
                pr_debug("%s: strdup failed\n", __func__);