From: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Date: Wed, 27 Jan 2016 13:47:19 +0000 (+0100)
Subject: rgw: fix dangeours usage of strtok in RGWAccessControlPolicy_SWIFT.
X-Git-Tag: v10.0.4~166^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=84175ba6ffaa67552d6a2517114e56f101ec2bac;p=ceph.git

rgw: fix dangeours usage of strtok in RGWAccessControlPolicy_SWIFT.

Fixes: #14526
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
---

diff --git a/src/rgw/rgw_acl_swift.cc b/src/rgw/rgw_acl_swift.cc
index 1f8f1ab4a07cf..a9729e33cc585 100644
--- a/src/rgw/rgw_acl_swift.cc
+++ b/src/rgw/rgw_acl_swift.cc
@@ -21,16 +21,18 @@ using namespace std;
 static int parse_list(string& uid_list, list<string>& uids)
 {
   char *s = strdup(uid_list.c_str());
-  if (!s)
+  if (!s) {
     return -ENOMEM;
+  }
 
-  const char *p = strtok(s, " ,");
+  char *tokctx;
+  const char *p = strtok_r(s, " ,", &tokctx);
   while (p) {
     if (*p) {
       string acl = p;
       uids.push_back(acl);
     }
-    p = strtok(NULL, " ,");
+    p = strtok_r(NULL, " ,", &tokctx);
   }
   free(s);
   return 0;