perf callchains: Switch from strtok() to strtok_r() when parsing options

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Apr 12, 2017 perf events

Share & tools

tip-bot for Arnaldo Carvalho de Melo

author merge bot

2017-04-12 05:35 UTC #0 lore raw

Commit-ID:  dadafc315ded31a36cb4899bc85ef4050f0332a7
Gitweb:     http://git.kernel.org/tip/dadafc315ded31a36cb4899bc85ef4050f0332a7
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Wed, 5 Apr 2017 11:38:10 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Tue, 11 Apr 2017 08:45:09 -0300

perf callchains: Switch from strtok() to strtok_r() when parsing options

Trying to keep everything reentrant.

Cc Namhyung Kim <[email protected]>

Link http://lkml.kernel.org/n/[email protected] open here

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

---
 tools/perf/util/callchain.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

tools/perf/util/callchain.c +2 -2

index 3cea1fb..2e5eff5 100644
@@ -116,7 +116,7 @@ static int
 __parse_callchain_report_opt(const char *arg, bool allow_record_opt)
 {
 	char *tok;
-	char *endptr;
+	char *endptr, *saveptr = NULL;
 	bool minpcnt_set = false;
 	bool record_opt_set = false;
 	bool try_stack_size = false;

@@ -127,7 +127,7 @@ __parse_callchain_report_opt(const char *arg, bool allow_record_opt)
 	if (!arg)
 		return 0;
 
-	while ((tok = strtok((char *)arg, ",")) != NULL) {
+	while ((tok = strtok_r((char *)arg, ",", &saveptr)) != NULL) {
 		if (!strncmp(tok, "none", strlen(tok))) {
 			callchain_param.mode = CHAIN_NONE;
 			callchain_param.enabled = false;