lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 11 Apr 2017 22:33:55 -0700 From: tip-bot for Arnaldo Carvalho de Melo <tipbot@...or.com> To: linux-tip-commits@...r.kernel.org Cc: mingo@...nel.org, tglx@...utronix.de, acme@...hat.com, namhyung@...nel.org, linux-kernel@...r.kernel.org, hpa@...or.com Subject: [tip:perf/core] perf callchains: Switch from strtok() to strtok_r() when parsing options Commit-ID: dadafc315ded31a36cb4899bc85ef4050f0332a7 Gitweb: http://git.kernel.org/tip/dadafc315ded31a36cb4899bc85ef4050f0332a7 Author: Arnaldo Carvalho de Melo <acme@...hat.com> AuthorDate: Wed, 5 Apr 2017 11:38:10 -0300 Committer: Arnaldo Carvalho de Melo <acme@...hat.com> 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 <namhyung@...nel.org> Link: http://lkml.kernel.org/n/tip-rdce0p2k9e1b4qnrb8ki9mtf@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com> --- tools/perf/util/callchain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c index 3cea1fb..2e5eff5 100644 --- a/tools/perf/util/callchain.c +++ b/tools/perf/util/callchain.c @@ -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;
Powered by blists - more mailing lists