Em Mon, Jun 06, 2016 at 07:52:54PM +0900, Taeung Song escreveu:
> 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.

Looks ok, applied.

- Arnaldo
 
> Cc: Namhyung Kim <namhy...@kernel.org>
> Cc: Jiri Olsa <jo...@redhat.com>
> Cc: Masami Hiramatsu <mhira...@kernel.org>
> Cc: Alexander Shishkin <alexander.shish...@linux.intel.com>
> Signed-off-by: Taeung Song <treeze.tae...@gmail.com>
> ---
>  tools/perf/util/config.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c
> index d013f90..062eeb8 100644
> --- a/tools/perf/util/config.c
> +++ b/tools/perf/util/config.c
> @@ -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__);
> -- 
> 2.5.0

Reply via email to