Commit 26dee028 authored by Wang Nan's avatar Wang Nan Committed by Arnaldo Carvalho de Melo

perf tools: Fix checking asprintf return value

According to man pages, asprintf returns -1 when failure. This patch
fixes two incorrect return value checker.
Signed-off-by: default avatarWang Nan <wangnan0@huawei.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Brendan Gregg <brendan.d.gregg@gmail.com>
Cc: Cody P Schafer <dev@codyps.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Jeremie Galarneau <jeremie.galarneau@efficios.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kirill Smelkov <kirr@nexedi.com>
Cc: Li Zefan <lizefan@huawei.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Cc: stable@vger.kernel.org # v4.4+
Fixes: ffeb883e ("perf tools: Show proper error message for wrong terms of hw/sw events")
Link: http://lkml.kernel.org/r/1455882283-79592-5-git-send-email-wangnan0@huawei.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 80cdce76
...@@ -2110,11 +2110,11 @@ char *parse_events_formats_error_string(char *additional_terms) ...@@ -2110,11 +2110,11 @@ char *parse_events_formats_error_string(char *additional_terms)
/* valid terms */ /* valid terms */
if (additional_terms) { if (additional_terms) {
if (!asprintf(&str, "valid terms: %s,%s", if (asprintf(&str, "valid terms: %s,%s",
additional_terms, static_terms)) additional_terms, static_terms) < 0)
goto fail; goto fail;
} else { } else {
if (!asprintf(&str, "valid terms: %s", static_terms)) if (asprintf(&str, "valid terms: %s", static_terms) < 0)
goto fail; goto fail;
} }
return str; return str;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment