Skip to content

lib/gis: Replace non-reentrant strtok with thread-safe strtok_r #7595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
NeelGhoshal wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

lib/gis: Replace non-reentrant strtok with thread-safe strtok_r #7595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions lib/gis/parser_interface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,12 +210,14 @@ void G__usage_xml(void)
fprintf(stdout, "\t\t<keydesc>\n");
top = G_calloc(strlen(opt->key_desc) + 1, 1);
strcpy(top, opt->key_desc);
s = strtok(top, ",");
char *saveptr;
s = strtok_r(top, ",", &saveptr);

for (i = 1; s != NULL; i++) {
fprintf(stdout, "\t\t\t<item order=\"%d\">", i);
print_escaped_for_xml(stdout, s);
fprintf(stdout, "</item>\n");
s = strtok(NULL, ",");
s = strtok_r(NULL, ",", &saveptr);
}
fprintf(stdout, "\t\t</keydesc>\n");
G_free(top);
Expand All @@ -225,11 +227,12 @@ void G__usage_xml(void)
const char *atts[] = {"age", "element", "prompt", NULL};
top = G_calloc(strlen(opt->gisprompt) + 1, 1);
strcpy(top, opt->gisprompt);
s = strtok(top, ",");
char *saveptr;
s = strtok_r(top, ",", &saveptr);
fprintf(stdout, "\t\t<gisprompt ");
for (i = 0; s != NULL && atts[i] != NULL; i++) {
fprintf(stdout, "%s=\"%s\" ", atts[i], s);
s = strtok(NULL, ",");
s = strtok_r(NULL, ",", &saveptr);
}
fprintf(stdout, "/>\n");
G_free(top);
Expand Down
21 changes: 13 additions & 8 deletions lib/gis/parser_wps.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,9 @@ void G__wps_print_process_description(void)
const char *atts[] = {"age", "element", "prompt", NULL};
top = G_calloc(strlen(opt->gisprompt) + 1, 1);
strcpy(top, opt->gisprompt);
s = strtok(top, ",");
char *saveptr = NULL;
s = strtok_r(top, ",", &saveptr);

for (i = 0; s != NULL && atts[i] != NULL; i++) {

char *token = G_store(s);
Expand Down Expand Up @@ -292,7 +294,7 @@ void G__wps_print_process_description(void)
if (strcmp(token, "file") == 0) {
data_type = TYPE_PLAIN_TEXT;
}
s = strtok(NULL, ",");
s = strtok_r(NULL, ",", &saveptr);
G_free(token);
}
G_free(top);
Expand All @@ -302,11 +304,12 @@ void G__wps_print_process_description(void)
if (opt->key_desc) {
top = G_calloc(strlen(opt->key_desc) + 1, 1);
strcpy(top, opt->key_desc);
s = strtok(top, ",");
char *saveptr = NULL;
s = strtok_r(top, ",", &saveptr);
/* Count comma's */
for (i = 0; s != NULL; i++) {
num_tuples++;
s = strtok(NULL, ",");
s = strtok_r(NULL, ",", &saveptr);
}
if (num_tuples > 1)
is_tuple = 1;
Expand Down Expand Up @@ -479,7 +482,8 @@ void G__wps_print_process_description(void)
const char *atts[] = {"age", "element", "prompt", NULL};
top = G_calloc(strlen(opt->gisprompt) + 1, 1);
strcpy(top, opt->gisprompt);
s = strtok(top, ",");
char *saveptr = NULL;
s = strtok_r(top, ",", &saveptr);
for (i = 0; s != NULL && atts[i] != NULL; i++) {

char *token = G_store(s);
Expand All @@ -505,7 +509,7 @@ void G__wps_print_process_description(void)
if (strcmp(token, "file") == 0) {
data_type = TYPE_PLAIN_TEXT;
}
s = strtok(NULL, ",");
s = strtok_r(NULL, ",", &saveptr);
G_free(token);
}
G_free(top);
Expand Down Expand Up @@ -867,10 +871,11 @@ static void wps_print_literal_input_output(
/* Check for range values */
if (datatype && (strcmp(datatype, "integer") == 0 ||
strcmp(datatype, "float") == 0)) {
str = strtok((char *)choices[0], "-");
char *saveptr = NULL;

@github-actions github-actions Bot Jun 23, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[pre-commit] reported by reviewdog 🐶

Suggested change
char *saveptr = NULL;
char *saveptr = NULL;

str = strtok_r((char *)choices[0], "-", &saveptr);
if (str != NULL) {
snprintf(range[0], 24, "%s", str);
str = strtok(NULL, "-");
str = strtok_r(NULL, "-", &saveptr);
if (str != NULL) {
snprintf(range[1], 24, "%s", str);
type = TYPE_RANGE;
Expand Down
Loading