Skip to content

Commit 6b87464

Browse files
mkasenbergsjanc
authored andcommitted
Replace strtok with strtok_r
strtok is not thread safe.
1 parent e4416ac commit 6b87464

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

apps/btshell/src/parse.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -428,11 +428,12 @@ parse_arg_byte_stream_delim(char *sval, char *delims, int max_len,
428428
char *endptr;
429429
char *token;
430430
int i;
431+
char *tok_ptr;
431432

432433
i = 0;
433-
for (token = strtok(sval, delims);
434+
for (token = strtok_r(sval, delims, &tok_ptr);
434435
token != NULL;
435-
token = strtok(NULL, delims)) {
436+
token = strtok_r(NULL, delims, &tok_ptr)) {
436437

437438
if (i >= max_len) {
438439
return EINVAL;
@@ -618,12 +619,13 @@ parse_arg_all(int argc, char **argv)
618619
char *key;
619620
char *val;
620621
int i;
622+
char *tok_ptr;
621623

622624
cmd_num_args = 0;
623625

624626
for (i = 0; i < argc; i++) {
625-
key = strtok(argv[i], "=");
626-
val = strtok(NULL, "=");
627+
key = strtok_r(argv[i], "=", &tok_ptr);
628+
val = strtok_r(NULL, "=", &tok_ptr);
627629

628630
if (key != NULL && val != NULL) {
629631
if (strlen(key) == 0) {

0 commit comments

Comments
 (0)