2004-11-18 Atsushi Enomoto <atsushi@ximian.com>

	* XmlParserContext.cs : the fix was not checked in :(

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

diff --git a/mcs/class/System.XML/System.Xml/ChangeLog b/mcs/class/System.XML/System.Xml/ChangeLog
index 3f1527125a0ac63e9f63457b276add324a2f76e7..83b92d76c7aa69c3b4cd41f1bee711f2e4716df6 100644 (file)
--- a/mcs/class/System.XML/System.Xml/ChangeLog
+++ b/mcs/class/System.XML/System.Xml/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-18  Atsushi Enomoto <atsushi@ximian.com>
+
+       * XmlParserContext.cs : the fix was not checked in :(
+
 2004-11-17  Atsushi Enomoto <atsushi@ximian.com>
 
        * XQueryConvert.cs : moved from System.Xml.Query.

diff --git a/mcs/class/System.XML/System.Xml/XmlParserContext.cs b/mcs/class/System.XML/System.Xml/XmlParserContext.cs
index 62a3cf5da29d72bd063057b1c8fd2b9b697ea215..5f452eaa7da81cb1d9525676793b60db25f7a4b8 100644 (file)
--- a/mcs/class/System.XML/System.Xml/XmlParserContext.cs
+++ b/mcs/class/System.XML/System.Xml/XmlParserContext.cs
@@ -264,7 +264,7 @@ namespace System.Xml
                                contextItems.Add (item);
                        }
                        else
-                               item = (ContextItem) contextItems [contextItemCount - 1];
+                               item = (ContextItem) contextItems [contextItemCount];
                        item.BaseURI = BaseURI;
                        item.XmlLang = XmlLang;
                        item.XmlSpace = XmlSpace;
@@ -273,6 +273,8 @@ namespace System.Xml
 
                internal void PopScope ()
                {
+                       if (contextItemCount == 0)
+                               throw new XmlException ("Unexpected end of element scope.");
                        contextItemCount--;
                        ContextItem prev = (ContextItem) contextItems [contextItemCount];
                        baseURI = prev.BaseURI;