From: Markus Elfring <[email protected]> Date: Mon, 23 Jan 2017 15:56:31 +0100
A local variable was set to an error code before a concrete error situation was detected. Thus move the corresponding assignment into an if branch to indicate a software failure there. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <[email protected]> --- tools/perf/util/strlist.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/strlist.c b/tools/perf/util/strlist.c index 0d3dfcb919b4..a934be385a6d 100644 --- a/tools/perf/util/strlist.c +++ b/tools/perf/util/strlist.c @@ -118,9 +118,10 @@ static int strlist__parse_list_entry(struct strlist *slist, const char *s, return strlist__load(slist, s + 7); if (subst_dir) { - err = -ENOMEM; - if (asprintf(&subst, "%s/%s", subst_dir, s) < 0) + if (asprintf(&subst, "%s/%s", subst_dir, s) < 0) { + err = -ENOMEM; goto out; + } if (access(subst, F_OK) == 0) { err = strlist__load(slist, subst); -- 2.11.0
