Replace calls to strtok() with strtok_r()

strtok() uses a static buffer, making it not thread safe.

Change-Id: Icce265153e1e65adafa8849334438ab6d190e541

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index e1f6f13301ae360c097d4bbe7845b7c570f7bb9e..ac922fa8b5e589f995c89297c408f0fa6458a1f9 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -11583,15 +11583,16 @@ static int process_sdp_a_text(const char *a, struct sip_pvt *p, struct ast_rtp_c
                                ast_verbose("Discarded description format %s for ID %u\n", mimeSubtype, codec);
                }
        } else if (!strncmp(a, red_fmtp, strlen(red_fmtp))) {
+               char *rest;
                /* count numbers of generations in fmtp */
                red_cp = &red_fmtp[strlen(red_fmtp)];
                strncpy(red_fmtp, a, 100);
 
                sscanf(red_cp, "%30u", (unsigned *)&red_data_pt[*red_num_gen]);
-               red_cp = strtok(red_cp, "/");
+               red_cp = strtok_r(red_cp, "/", &rest);
                while (red_cp && (*red_num_gen)++ < AST_RED_MAX_GENERATION) {
                        sscanf(red_cp, "%30u", (unsigned *)&red_data_pt[*red_num_gen]);
-                       red_cp = strtok(NULL, "/");
+                       red_cp = strtok_r(NULL, "/", &rest);
                }
                red_cp = red_fmtp;
                found = TRUE;

diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index d2c9877f9ef83170b4a709f732ad07eb6956b0d1..5c36c5a35cb5cbc25523084ad71d56cad8a3f964 100644 (file)
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -2955,6 +2955,8 @@ static char *dundi_show_cache(struct ast_cli_entry *e, int cmd, struct ast_cli_a
        db_tree = ast_db_gettree("dundi/cache", NULL);
        ast_cli(a->fd, FORMAT2, "Number", "Context", "Expiration", "From", "Weight", "Destination (Flags)");
        for (db_entry = db_tree; db_entry; db_entry = db_entry->next) {
+               char *rest;
+
                if ((strncmp(db_entry->key, "/dundi/cache/hint/", 18) == 0) || ast_get_time_t(db_entry->data, &ts, 0, &length)) {
                        continue;
                }
@@ -2966,10 +2968,10 @@ static char *dundi_show_cache(struct ast_cli_entry *e, int cmd, struct ast_cli_a
                }
 
                ptr = db_entry->key + sizeof("/dundi/cache");
-               strtok(ptr, "/");
-               number = strtok(NULL, "/");
-               context = strtok(NULL, "/");
-               ptr = strtok(NULL, "/");
+               strtok_r(ptr, "/", &rest);
+               number = strtok_r(NULL, "/", &rest);
+               context = strtok_r(NULL, "/", &rest);
+               ptr = strtok_r(NULL, "/", &rest);
 
                if (*ptr != 'e') {
                        continue;
@@ -3047,6 +3049,8 @@ static char *dundi_show_hints(struct ast_cli_entry *e, int cmd, struct ast_cli_a
        ast_cli(a->fd, FORMAT2, "Prefix", "Context", "Expiration", "From");
 
        for (db_entry = db_tree; db_entry; db_entry = db_entry->next) {
+               char *rest;
+
                if (ast_get_time_t(db_entry->data, &ts, 0, &length)) {
                        continue;
                }
@@ -3058,10 +3062,10 @@ static char *dundi_show_hints(struct ast_cli_entry *e, int cmd, struct ast_cli_a
                }
 
                ptr = db_entry->key + sizeof("/dundi/cache/hint");
-               src = strtok(ptr, "/");
-               number = strtok(NULL, "/");
-               context = strtok(NULL, "/");
-               ptr = strtok(NULL, "/");
+               src = strtok_r(ptr, "/", &rest);
+               number = strtok_r(NULL, "/", &rest);
+               context = strtok_r(NULL, "/", &rest);
+               ptr = strtok_r(NULL, "/", &rest);
 
                if (*ptr != 'e') {
                        continue;

diff --git a/res/res_fax.c b/res/res_fax.c
index b7aadc157d5950a7d8664b9d8ee9b33fdb83e2d4..37a55619db305cb089289786622c2628cbcc3635 100644 (file)
--- a/res/res_fax.c
+++ b/res/res_fax.c
@@ -809,17 +809,17 @@ unsigned int ast_fax_minrate(void)
 
 static int update_modem_bits(enum ast_fax_modems *bits, const char *value)
 {
-       char *m[5], *tok, *v = (char *)value;
+       char *m[5], *tok, *v = (char *) value, *rest;
        int i = 0, j;
 
        if (!strchr(v, ',')) {
                m[i++] = v;
                m[i] = NULL;
        } else {
-               tok = strtok(v, ", ");
+               tok = strtok_r(v, ", ", &rest);
                while (tok && i < ARRAY_LEN(m) - 1) {
                        m[i++] = tok;
-                       tok = strtok(NULL, ", ");
+                       tok = strtok_r(NULL, ", ", &rest);
                }
                m[i] = NULL;
        }