Fix Xaml reader to parse escaped values correctly

2 files changed, 23 insertions, 11 deletions

diff --git a/mcs/class/System.Xaml/System.Xaml/XamlXmlReader.cs b/mcs/class/System.Xaml/System.Xaml/XamlXmlReader.cs
index bf855511f61..f025676ecb9 100644
--- a/mcs/class/System.Xaml/System.Xaml/XamlXmlReader.cs
+++ b/mcs/class/System.Xaml/System.Xaml/XamlXmlReader.cs
@@ -317,18 +317,23 @@ namespace System.Xaml
 				// FIXME: is this rule correct?
 				var v = pair.Value;
 				if (!String.IsNullOrEmpty (v) && v [0] == '{') {
-					var pai = ParsedMarkupExtensionInfo.Parse (v, xaml_namespace_resolver, sctx);
-					yield return Node (XamlNodeType.StartObject, pai.Type);
-					foreach (var xepair in pai.Arguments) {
-						yield return Node (XamlNodeType.StartMember, xepair.Key);
-						if (xepair.Value is List<string>)
-							foreach (var s in (List<string>) xepair.Value)
-								yield return Node (XamlNodeType.Value, s);
-						else
-							yield return Node (XamlNodeType.Value, xepair.Value);
-						yield return Node (XamlNodeType.EndMember, xepair.Key);
+					if (v.Length > 1 && v [1] == '}') {
+						//Escaped value
+						yield return Node (XamlNodeType.Value, v.Substring (2));
+					} else {
+						var pai = ParsedMarkupExtensionInfo.Parse (v, xaml_namespace_resolver, sctx);
+						yield return Node (XamlNodeType.StartObject, pai.Type);
+						foreach (var xepair in pai.Arguments) {
+							yield return Node (XamlNodeType.StartMember, xepair.Key);
+							if (xepair.Value is List<string>)
+								foreach (var s in (List<string>) xepair.Value)
+									yield return Node (XamlNodeType.Value, s);
+							else
+								yield return Node (XamlNodeType.Value, xepair.Value);
+							yield return Node (XamlNodeType.EndMember, xepair.Key);
+						}
+						yield return Node (XamlNodeType.EndObject, pai.Type);
 					}
-					yield return Node (XamlNodeType.EndObject, pai.Type);
 				}
 				else
 					yield return Node (XamlNodeType.Value, pair.Value);
diff --git a/mcs/class/System.Xaml/Test/System.Xaml/XamlXmlReaderTest.cs b/mcs/class/System.Xaml/Test/System.Xaml/XamlXmlReaderTest.cs
index b2d90b00e0c..5e58267cc9a 100755
--- a/mcs/class/System.Xaml/Test/System.Xaml/XamlXmlReaderTest.cs
+++ b/mcs/class/System.Xaml/Test/System.Xaml/XamlXmlReaderTest.cs
@@ -720,6 +720,13 @@ namespace MonoTests.System.Xaml
 			Read_ContentPropertyContainer (r);
 		}
 
+		[Test]
+		public void EscapedValue ()
+		{
+			var exception = (Exception)XamlServices.Load(new StringReader("<Exception xmlns=\"clr-namespace:System;assembly=mscorlib\" HelpLink=\"{}{123}\" />"));
+			Assert.AreEqual ("{123}", exception.HelpLink);
+		}
+
 		#region non-common tests
 		[Test]
 		public void Bug680385 ()