Fix performance and security issues reported by pagespeed and skipfish.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1088508 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 3 insertions, 3 deletions

diff --git a/sca-cpp/trunk/kernel/sstream.hpp b/sca-cpp/trunk/kernel/sstream.hpp
index 770c169e09..a638e2dcca 100644
--- a/sca-cpp/trunk/kernel/sstream.hpp
+++ b/sca-cpp/trunk/kernel/sstream.hpp
@@ -184,16 +184,16 @@ private:
  */
 const list<string> tokenize(const char* sep, const string& str) {
     struct nested {
-        static const list<string> tokenize(const char* sep, const string& str, const size_t start = 0) {
+        static const list<string> tokenize(const char* sep, const size_t slen, const string& str, const size_t start) {
             if (start >= length(str))
                 return list<string>();
             const size_t i = find(str, sep, start);
             if (i == length(str))
                 return mklist(string(substr(str, start)));
-            return cons(string(substr(str, start, i - start)), tokenize(sep, str, i + 1));
+            return cons(string(substr(str, start, i - start)), tokenize(sep, slen, str, i + slen));
         }
     };
-    return nested::tokenize(sep, str, 0);
+    return nested::tokenize(sep, strlen(sep), str, 0);
 }
 
 /**