Fix critical svace issuesubmit/tizen/20210209.081103accepted/tizen/unified/20210210.130331tizenaccepted/tizen_unified

Change-Id: Ifada7275c36ff6ca59ed51d068a257398ba69a84
Signed-off-by: Mukunth A <a.mukunth@samsung.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/CMain/src/orchestration_dbus_server.c b/CMain/src/orchestration_dbus_server.c
index b5b06d3..adb85f4 100644
--- a/CMain/src/orchestration_dbus_server.c
+++ b/CMain/src/orchestration_dbus_server.c
@@ -262,10 +262,10 @@ static void _handle_method_call(
             {
                 // find count of IP addr
                 ipaddr_listcopy = strdup(ipaddr_list);
-                char *token = strtok(ipaddr_listcopy, ",");
-                while (token != NULL)
+                char *str = ipaddr_listcopy;
+                char *token = NULL;
+                while ((token = strtok_r(str, ",", &str)))
                 {
-                    token = strtok(NULL, ",");
                     count++;
                 }
 
@@ -273,8 +273,9 @@ static void _handle_method_call(
                 {
                     // Parse IP address
                     ipaddr = (char**) malloc(sizeof(char *) * count);
-                    token = strtok(ipaddr_list, ",");
-                    while (token != NULL)
+                    str = ipaddr_list;
+                    token = NULL;
+                    while ((token = strtok_r(str, ",", &str)))
                     {
                         char *addr = (char*) malloc(sizeof(char) * (strlen(token) + 1));
                         if (addr)
@@ -284,7 +285,6 @@ static void _handle_method_call(
                             ipaddr[num_ip] = addr;
                             num_ip++;
                         }
-                        token = strtok(NULL, ",");
                     }
                 }
                 free(ipaddr_listcopy);