Merge pull request #2566 from lambdageek/monoerror-mono_module_get_object

[mono.git] / mcs / class / corlib / Mono.Xml / SecurityParser.cs

diff --git a/mcs/class/corlib/Mono.Xml/SecurityParser.cs b/mcs/class/corlib/Mono.Xml/SecurityParser.cs
index a69408a0d9404fdd5ec081286465b06067f5081b..49919b9779d1c53fcba30ea571a8cad403cb5bfe 100644 (file)
--- a/mcs/class/corlib/Mono.Xml/SecurityParser.cs
+++ b/mcs/class/corlib/Mono.Xml/SecurityParser.cs
@@ -7,14 +7,43 @@
 // (C) 2003 Motus Technologies Inc. (http://www.motus.com)
 //
 
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System;
 using System.Collections;
+using System.IO;
 using System.Security;
 
 namespace Mono.Xml {
 
        // convert an XML document into SecurityElement objects
-       public class SecurityParser : MiniParser, MiniParser.IHandler, MiniParser.IReader {
+#if INSIDE_CORLIB
+       internal
+#else
+       public
+#endif
+       class SecurityParser : SmallXmlParser, SmallXmlParser.IContentHandler {
 
                private SecurityElement root;
 
@@ -26,10 +55,8 @@ namespace Mono.Xml {
                public void LoadXml (string xml) 
                {
                        root = null;
-                       xmldoc = xml;
-                       pos = 0;
                        stack.Clear ();
-                       Parse (this, this);
+                       Parse (new StringReader (xml), this);
                }
 
                public SecurityElement ToXml () 
@@ -37,26 +64,18 @@ namespace Mono.Xml {
                        return root;
                }
 
-               // IReader
-
-               private string xmldoc;
-               private int pos;
-
-               public int Read () 
-               {
-                       if (pos >= xmldoc.Length)
-                               return -1;
-                       return (int) xmldoc [pos++];
-               }
-
-               // IHandler
+               // IContentHandler
 
                private SecurityElement current;
                private Stack stack;
 
-               public void OnStartParsing (MiniParser parser) {}
+               public void OnStartParsing (SmallXmlParser parser) {}
+
+               public void OnProcessingInstruction (string name, string text) {}
+
+               public void OnIgnorableWhitespace (string s) {}
 
-               public void OnStartElement (string name, MiniParser.IAttrList attrs) 
+               public void OnStartElement (string name, SmallXmlParser.IAttrList attrs) 
                {
                        SecurityElement newel = new SecurityElement (name); 
                        if (root == null) {
@@ -72,7 +91,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) 
@@ -82,9 +101,9 @@ namespace Mono.Xml {
 
                public void OnChars (string ch) 
                {
-                       current.Text = ch;
+                       current.Text = SecurityElement.Escape (ch);
                }
 
-               public void OnEndParsing (MiniParser parser) {}
+               public void OnEndParsing (SmallXmlParser parser) {}
        }
 }