perf thread_map: Free strlist on normal path in thread_map__new_by_tid_str()

Yang Jihong · namhyung · commit 1eb3d924e3c0 · 2024-02-09T14:08:41.000-08:00
slist needs to be freed in both error path and normal path in thread_map__new_by_tid_str(). Fixes: b52956c ("perf tools: Allow multiple threads or processes in record, stat, top") Reviewed-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Yang Jihong <yangjihong1@huawei.com> Signed-off-by: Namhyung Kim <namhyung@kernel.org> Link: https://lore.kernel.org/r/20240206083228.172607-6-yangjihong1@huawei.com
diff --git a/tools/perf/util/thread_map.c b/tools/perf/util/thread_map.c
@@ -280,13 +280,13 @@ struct perf_thread_map *thread_map__new_by_tid_str(const char *tid_str)
 		threads->nr = ntasks;
 	}
 out:
+	strlist__delete(slist);
 	if (threads)
 		refcount_set(&threads->refcnt, 1);
 	return threads;
 
 out_free_threads:
 	zfree(&threads);
-	strlist__delete(slist);
 	goto out;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -280,13 +280,13 @@ struct perf_thread_map thread_map__new_by_tid_str(const char tid_str)`
`280`	`280`	`threads->nr = ntasks;`
`281`	`281`	`}`
`282`	`282`	`out:`
	`283`	`+ strlist__delete(slist);`
`283`	`284`	`if (threads)`
`284`	`285`	`refcount_set(&threads->refcnt, 1);`
`285`	`286`	`return threads;`
`286`	`287`
`287`	`288`	`out_free_threads:`
`288`	`289`	`zfree(&threads);`
`289`		`- strlist__delete(slist);`
`290`	`290`	`goto out;`
`291`	`291`	`}`
`292`	`292`