Fixed bug ICE-5543: stringToIdentity bug with escaped escapes

2 files changed, 24 insertions, 2 deletions

diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index aa9f8247e3b..23b4b9671cb 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -449,12 +449,22 @@ IceInternal::Instance::stringToIdentity(const string& s) const
     Identity ident;
 
     //
-    // Find unescaped separator.
+    // Find unescaped separator; note that the string may contain an escaped
+    // backslash before the separator.
     //
     string::size_type slash = string::npos, pos = 0;
     while((pos = s.find('/', pos)) != string::npos)
     {
-        if(pos == 0 || s[pos - 1] != '\\')
+        int escapes = 0;
+        while(static_cast<int>(pos)- escapes > 0 && s[pos - escapes - 1] == '\\')
+        {
+            escapes++;
+        }
+
+        //
+        // We ignore escaped escapes
+        //
+        if(escapes % 2 == 0)
         {
             if(slash == string::npos)
             {
diff --git a/cpp/test/Ice/proxy/AllTests.cpp b/cpp/test/Ice/proxy/AllTests.cpp
index 32cad69153d..6778baef2b7 100644
--- a/cpp/test/Ice/proxy/AllTests.cpp
+++ b/cpp/test/Ice/proxy/AllTests.cpp
@@ -252,6 +252,18 @@ allTests(const Ice::CommunicatorPtr& communicator)
     catch(const Ice::EndpointParseException&)
     {
     }
+
+    //
+    // Test for bug ICE-5543: escaped escapes in stringToIdentity
+    //
+    Ice::Identity id = { "test", ",X2QNUAzSBcJ_e$AV;E\\" };
+    Ice::Identity id2 = communicator->stringToIdentity(communicator->identityToString(id));
+    test(id == id2);
+
+    id = { "test", ",X2QNUAz\\SB\\/cJ_e$AV;E\\\\" };
+    id2 = communicator->stringToIdentity(communicator->identityToString(id));
+    test(id == id2);
+
     cout << "ok" << endl;
 
     cout << "testing propertyToProxy... " << flush;