Fix OOM in parser

Add eof checks to: - MarkupParser.xEntityValue - MarkupParser.xComment - MarkupParser.systemLiteral - MarkupParser.pubidLiteral - MarkupParser.notationDecl - MarkupParserCommon.xAttributeValue - MarkupParserCommon.xTakeUntil
scala · Jun 26, 2018 · 239e3ed · 239e3ed
1 parent 6f76dd1
commit 239e3ed
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 17 deletions.
diff --git a/jvm/src/test/scala/scala/xml/XMLTest.scala b/jvm/src/test/scala/scala/xml/XMLTest.scala
@@ -766,8 +766,8 @@ class XMLTestJVM {
     assertEquals(x, XML.loadString(formatted))
   }
 
-  @UnitTest(expected = classOf[FatalError])
-  def xTokenFailure {
+  @UnitTest
+  def xTokenTest {
     val x = xml.parsing.ConstructingParser.fromSource(io.Source.fromString("a"), false)
     assertEquals((): Unit, x.xToken('b'))
   }
@@ -786,27 +786,39 @@ class XMLTestJVM {
     x.xComment
   }
 
-  @UnitTest(expected = classOf[FatalError])
-  def xmlProcInstrFailure {
+  @UnitTest
+  def xmlProcInstrTest {
     val x = xml.parsing.ConstructingParser.fromSource(io.Source.fromString("aa"), false)
 
     assertEquals(new UnprefixedAttribute("aa", Text(""), Null), x.xmlProcInstr)
   }
 
-  @Ignore("Ignored for future fix, currently throw OOE because of infinity MarkupParserCommon:66")
   @UnitTest(expected = classOf[FatalError])
-  def xAttributeValueFailure {
+  def notationDeclFailure {
     val x = xml.parsing.ConstructingParser.fromSource(io.Source.fromString(""), false)
 
-    x.xAttributeValue
+    x.notationDecl
   }
 
-  @Ignore("Ignored for future fix, currently return unexpected result")
-  @UnitTest(expected = classOf[FatalError])
-  def xEntityValueFailure {
+  @UnitTest
+  def pubidLiteralTest {
+    val x = xml.parsing.ConstructingParser.fromSource(io.Source.fromString(""), false)
+
+    assertEquals("", x.pubidLiteral)
+  }
+
+  @UnitTest
+  def xAttributeValueTest {
+    val x = xml.parsing.ConstructingParser.fromSource(io.Source.fromString("'"), false)
+
+    assertEquals("", x.xAttributeValue)
+  }
+
+  @UnitTest
+  def xEntityValueTest {
     val x = xml.parsing.ConstructingParser.fromSource(io.Source.fromString(""), false)
 
-    x.xEntityValue
+    assertEquals("", x.xEntityValue)
   }
 
 }
diff --git a/shared/src/main/scala/scala/xml/parsing/MarkupParser.scala b/shared/src/main/scala/scala/xml/parsing/MarkupParser.scala
@@ -397,7 +397,7 @@ trait MarkupParser extends MarkupParserCommon with TokenTests {
       } else sb.append(ch)
       nextch()
     }
-    throw truncatedError("broken comment")
+    truncatedError("broken comment")
   }
 
   /* todo: move this into the NodeBuilder class */
@@ -928,7 +928,7 @@ trait MarkupParser extends MarkupParserCommon with TokenTests {
       new PublicID(pubID, sysID)
     } else {
       reportSyntaxError("PUBLIC or SYSTEM expected")
-      scala.sys.error("died parsing notationdecl")
+      truncatedError("died parsing notationdecl")
     }
     xSpaceOpt()
     xToken('>')

diff --git a/shared/src/main/scala/scala/xml/parsing/MarkupParserCommon.scala b/shared/src/main/scala/scala/xml/parsing/MarkupParserCommon.scala
@@ -19,7 +19,7 @@ import Utility.SU
  *  All members should be accessed through those.
  */
 private[scala] trait MarkupParserCommon extends TokenTests {
-  protected def unreachable = scala.sys.error("Cannot be reached.")
+  protected def unreachable = truncatedError("Cannot be reached.")
 
   // type HandleType       // MarkupHandler, SymbolicXMLBuilder
   type InputType // Source, CharArrayReader
@@ -62,7 +62,7 @@ private[scala] trait MarkupParserCommon extends TokenTests {
     val buf = new StringBuilder
     while (ch != endCh && !eof) {
       // well-formedness constraint
-      if (ch == '<') return errorAndResult("'<' not allowed in attrib value", "")
+      if (ch == '<') reportSyntaxError("'<' not allowed in attrib value")
       else if (ch == SU) truncatedError("")
       else buf append ch_returning_nextch
     }
@@ -241,11 +241,11 @@ private[scala] trait MarkupParserCommon extends TokenTests {
       val head = until.head
       val rest = until.tail
 
-      while (true) {
+      while (!eof) {
         if (ch == head && peek(rest))
           return handler(positioner(), sb.toString)
         else if (ch == SU || eof)
-          truncatedError("") // throws TruncatedXMLControl in compiler
+          truncatedError(s"died parsing until $until") // throws TruncatedXMLControl in compiler
 
         sb append ch
         nextch()