2007-11-07 Atsushi Enomoto <atsushi@ximian.com>

	* SecurityParser.cs : fix in sync with r89135 anr r89136.

svn path=/trunk/mcs/; revision=89139

diff --git a/mcs/class/Mono.Security/Mono.Xml/ChangeLog b/mcs/class/Mono.Security/Mono.Xml/ChangeLog
index e594c266ea13cc0fa480ea113d92776deec5e193..c43cf47029c4509acccd6f96317702c5b6f21fd2 100644 (file)
--- a/mcs/class/Mono.Security/Mono.Xml/ChangeLog
+++ b/mcs/class/Mono.Security/Mono.Xml/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-07  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * SecurityParser.cs : fix in sync with r89135 anr r89136.
+
 2004-09-17  Sebastien Pouliot  <sebastien@ximian.com>
 
        * MiniParser.cs: In synch with corlib version. Removed all level 4 

diff --git a/mcs/class/Mono.Security/Mono.Xml/SecurityParser.cs b/mcs/class/Mono.Security/Mono.Xml/SecurityParser.cs
index e2574d21867e8062a9ebc809e21fc4f3d510c1cb..8e6e93b1c43473977e1095e8152b0af671457dd7 100644 (file)
--- a/mcs/class/Mono.Security/Mono.Xml/SecurityParser.cs
+++ b/mcs/class/Mono.Security/Mono.Xml/SecurityParser.cs
@@ -99,7 +99,7 @@ namespace Mono.Xml {
                        // attributes
                        int n = attrs.Length;
                        for (int i=0; i < n; i++)
-                               current.AddAttribute (attrs.GetName (i), attrs.GetValue (i));
+                               current.AddAttribute (attrs.GetName (i), SecurityElement.Escape (attrs.GetValue (i)));
                }
 
                public void OnEndElement (string name) 
@@ -109,7 +109,7 @@ namespace Mono.Xml {
 
                public void OnChars (string ch) 
                {
-                       current.Text = ch;
+                       current.Text = SecurityElement.Escape (ch);
                }
 
                public void OnEndParsing (MiniParser parser) {}