Don't use strtok(3)

strtok(3) is not re-entrant, use strtok_r(3).

Author: haesbaert

kubernetes/config/authn_plugin/plugins/oidc/libkubernetes_oidc.c

@@ -29,6 +29,7 @@
 static time_t get_token_expiration_time(const char *token_string)
 {
     static char fname[] = "get_token_expiration_time()";
+    char *last;
 
     time_t expiration_time = 0;
 
@@ -41,12 +42,12 @@ static time_t get_token_expiration_time(const char *token_string)
     }
 
     char *p = NULL;
-    p = strtok(dup_token_string, OIDC_ID_TOKEN_DELIM);  /* jwt header */
+    p = strtok_r(dup_token_string, OIDC_ID_TOKEN_DELIM, &last);  /* jwt header */
     if (!p) {
         fprintf(stderr, "%s: The token <%s> is not a valid JWT token.\n", fname, token_string);
         goto end;
     }
-    p = strtok(NULL, OIDC_ID_TOKEN_DELIM);  /* jwt part2 */
+    p = strtok_r(NULL, OIDC_ID_TOKEN_DELIM, &last);  /* jwt part2 */
     if (!p) {
         fprintf(stderr, "%s: The token <%s> is not a valid JWT token.\n", fname, token_string);
         goto end;

kubernetes/watch/watch_util.c

@@ -10,6 +10,8 @@
 
 static int wu_convert_to_json_array(list_t * json_array, const char *json_string)
 {
+    char *last;
+
     if (!json_string || '\0' == json_string[0] || !json_array) {
         return -1;
     }
@@ -18,7 +20,7 @@ static int wu_convert_to_json_array(list_t * json_array, const char *json_string
     char *json_string_dup = strdup(json_string);
 
     char *token = NULL;
-    token = strtok(json_string_dup, JSON_ARRAY_DELIM);
+    token = strtok_r(json_string_dup, JSON_ARRAY_DELIM, &last);
     while (token) {
         cJSON *cjson = cJSON_Parse(token);
         if (cjson == NULL) {
@@ -27,7 +29,7 @@ static int wu_convert_to_json_array(list_t * json_array, const char *json_string
         }
         cJSON_Delete(cjson);
         list_addElement(json_array, strdup(token));
-        token = strtok(NULL, JSON_ARRAY_DELIM);
+        token = strtok_r(NULL, JSON_ARRAY_DELIM, &last);
     }
 
   end: