Fixed bug 4511 - properties override doesn't handle quotes

1 files changed, 31 insertions, 29 deletions

diff --git a/cpp/src/IceUtil/StringUtil.cpp b/cpp/src/IceUtil/StringUtil.cpp
index 296c5dd9cf6..edec3076976 100644
--- a/cpp/src/IceUtil/StringUtil.cpp
+++ b/cpp/src/IceUtil/StringUtil.cpp
@@ -321,50 +321,52 @@ IceUtilInternal::splitString(const string& str, const string& delim, vector<stri
     string::size_type length = str.length();
     string elt;
 
+    char quoteChar = '\0';
     while(pos < length)
     {
-        char quoteChar = '\0';
-        if(str[pos] == '"' || str[pos] == '\'')
+        if(quoteChar == '\0' && (str[pos] == '"' || str[pos] == '\''))
+        {
+            quoteChar = str[pos++];
+            continue; // Skip the quote
+        }
+        else if(quoteChar != '\0' && str[pos] == '\\' && pos + 1 < length && str[pos + 1] == quoteChar)
         {
-            quoteChar = str[pos];
             ++pos;
         }
-        while(pos < length)
+        else if(quoteChar != '\0' && str[pos] == quoteChar)
         {
-            if(quoteChar != '\0' && str[pos] == '\\' && pos + 1 < length && str[pos + 1] == quoteChar)
-            {
-                ++pos;
-            }
-            else if(quoteChar != '\0' && str[pos] == quoteChar)
+            ++pos;
+            quoteChar = '\0';
+            continue; // Skip the end quote
+        }
+        else if(delim.find(str[pos]) != string::npos)
+        {
+            if(quoteChar == '\0')
             {
                 ++pos;
-                quoteChar = '\0';
-                break;
-            }
-            else if(delim.find(str[pos]) != string::npos)
-            {
-                if(quoteChar == '\0')
+                if(elt.length() > 0)
                 {
-                    ++pos;
-                    break;
+                    result.push_back(elt);
+                    elt = "";
                 }
-            }
-            
-            if(pos < length)
-            {
-               elt += str[pos++];
+                continue;
             }
         }
-        if(quoteChar != '\0')
-        {
-            return false; // Unmatched quote.
-        }
-        if(elt.length() > 0)
+            
+        if(pos < length)
         {
-            result.push_back(elt);
-            elt = "";
+            elt += str[pos++];
         }
     }
+
+    if(elt.length() > 0)
+    {
+        result.push_back(elt);
+    }
+    if(quoteChar != '\0')
+    {
+        return false; // Unmatched quote.
+    }
     return true;
 }