[KeyManager] Function strtok replaced with strtok_r.
authorPawel Andruszkiewicz <p.andruszkie@samsung.com>
Tue, 8 Mar 2016 09:33:15 +0000 (10:33 +0100)
committerPawel Andruszkiewicz <p.andruszkie@samsung.com>
Tue, 8 Mar 2016 09:33:15 +0000 (10:33 +0100)
Fixes: SVACE 40857
[Verification] Code compiles, not tested, test does not start.

Change-Id: Ie6af0e302af2a3240733a5091462569074dc4755
Signed-off-by: Pawel Andruszkiewicz <p.andruszkie@samsung.com>
src/keymanager/keymanager_instance.cc

index 1a401e0d56aba57d5252a3f11e4bb73d1cca1a97..3a5439ecc405c92f18c860040b2f8944f6a10b4c 100644 (file)
@@ -42,6 +42,8 @@ typedef std::vector<unsigned char> RawBuffer;
 
 typedef int (*AliasListFunction)(ckmc_alias_list_s**);
 
+const std::string kSpace = " ";
+
 void GetGenericAliasList(AliasListFunction func, picojson::object* out) {
   LoggerD("Enter");
 
@@ -60,9 +62,10 @@ void GetGenericAliasList(AliasListFunction func, picojson::object* out) {
     while (head) {
       //aliases.push_back(picojson::value(head->alias ? head->alias : ""));
       if(head->alias) {
-        char* tokenized = strtok(head->alias," ");
+        char* saveptr = nullptr;
+        char* tokenized = strtok_r(head->alias, kSpace.c_str(), &saveptr);
         obj["packageId"] = picojson::value(tokenized);
-        tokenized = strtok(NULL," ");
+        tokenized = strtok_r(nullptr, kSpace.c_str(), &saveptr);
         obj["name"] = picojson::value(tokenized);
 
         aliases.push_back(resultElem);