Author: atsushi
Date: 2007-04-03 03:41:06 -0400 (Tue, 03 Apr 2007)
New Revision: 75325

Modified:
   trunk/mcs/class/System.XML/System.Xml/ChangeLog
   trunk/mcs/class/System.XML/System.Xml/XmlTextReader.cs
   trunk/mcs/class/System.XML/Test/System.Xml/ChangeLog
   trunk/mcs/class/System.XML/Test/System.Xml/XmlTextReaderTests.cs
Log:
2007-04-03  Atsushi Enomoto  <[EMAIL PROTECTED]>

        * XmlTextReader.cs : character ']' inside DTD comment caused parser
          error. Fixed bug #81294.

        * XmlTextReaderTests.cs : added test for bug #81294.



Modified: trunk/mcs/class/System.XML/System.Xml/ChangeLog
===================================================================
--- trunk/mcs/class/System.XML/System.Xml/ChangeLog     2007-04-03 07:30:10 UTC 
(rev 75324)
+++ trunk/mcs/class/System.XML/System.Xml/ChangeLog     2007-04-03 07:41:06 UTC 
(rev 75325)
@@ -1,3 +1,8 @@
+2007-04-03  Atsushi Enomoto  <[EMAIL PROTECTED]>
+
+       * XmlTextReader.cs : character ']' inside DTD comment caused parser
+         error. Fixed bug #81294.
+
 2007-03-05  Atsushi Enomoto  <[EMAIL PROTECTED]>
 
        * XmlReader.cs : when Create() returns customized XmlTextReader, set

Modified: trunk/mcs/class/System.XML/System.Xml/XmlTextReader.cs
===================================================================
--- trunk/mcs/class/System.XML/System.Xml/XmlTextReader.cs      2007-04-03 
07:30:10 UTC (rev 75324)
+++ trunk/mcs/class/System.XML/System.Xml/XmlTextReader.cs      2007-04-03 
07:41:06 UTC (rev 75325)
@@ -2526,8 +2526,8 @@
                                                continueParse = false;
                                                break;
                                        case DtdInputState.InsideDoubleQuoted:
-                                               continue;
                                        case DtdInputState.InsideSingleQuoted:
+                                       case DtdInputState.Comment:
                                                continue;
                                        default:
                                                throw NotWFError ("unexpected 
end of file at DTD.");

Modified: trunk/mcs/class/System.XML/Test/System.Xml/ChangeLog
===================================================================
--- trunk/mcs/class/System.XML/Test/System.Xml/ChangeLog        2007-04-03 
07:30:10 UTC (rev 75324)
+++ trunk/mcs/class/System.XML/Test/System.Xml/ChangeLog        2007-04-03 
07:41:06 UTC (rev 75325)
@@ -1,3 +1,7 @@
+2007-04-03  Atsushi Enomoto  <[EMAIL PROTECTED]>
+
+       * XmlTextReaderTests.cs : added test for bug #81294.
+
 2007-03-05  Atsushi Enomoto  <[EMAIL PROTECTED]>
 
        * XmlReaderSettingsTests.cs : added test for bug #81000.

Modified: trunk/mcs/class/System.XML/Test/System.Xml/XmlTextReaderTests.cs
===================================================================
--- trunk/mcs/class/System.XML/Test/System.Xml/XmlTextReaderTests.cs    
2007-04-03 07:30:10 UTC (rev 75324)
+++ trunk/mcs/class/System.XML/Test/System.Xml/XmlTextReaderTests.cs    
2007-04-03 07:41:06 UTC (rev 75325)
@@ -1253,5 +1253,14 @@
                                                        new string (buf, 0, c));
                        AssertEquals ("total lines", 5, n);
                }
+
+               [Test] // bug #81294
+               public void DtdCommentContainsCloseBracket ()
+               {
+                       string xml = @"<!DOCTYPE kanjidic2 [<!ELEMENT kanjidic2 
EMPTY> <!-- ] --> ]><kanjidic2 />";
+                       XmlTextReader xtr = new XmlTextReader (xml, 
XmlNodeType.Document, null);
+                       while (!xtr.EOF)
+                               xtr.Read ();
+               }
        }
 }

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to