#243 Escape xpath names when they contain tabs or quotes.

KevinJump · Jun 3, 2021 · 15d7749 · 15d7749
1 parent 3250104
commit 15d7749
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/uSync.Core/Tracking/SyncXmlTracker.cs b/uSync.Core/Tracking/SyncXmlTracker.cs
@@ -192,14 +192,26 @@ private string MakeSelectionPath(XElement node, string keys)
                 var value = GetKeyValue(node, key);
                 if (!string.IsNullOrWhiteSpace(value))
                 {
-                    selectionPath += $"[{key} = '{value}']";
+                    selectionPath += $"[{key} = {EscapeXPathString(value)}]";
                 }
 
             }
 
             return selectionPath.Replace("][", " and ");
         }
 
+        private string EscapeXPathString(string value)
+        {
+            if (!value.Contains("'"))
+                return '\'' + value + '\'';
+
+            if (!value.Contains("\""))
+                return '"' + value + '"';
+
+            return "concat('" + value.Replace("'", "',\"'\",'") + "')";
+        }
+
+
         private string MakeSelectionName(XElement node, string keys)
         {
             var names = new List<string>();