Merge pull request #676 from dubinsky/mismatched-quotes-infinite-loop

dubinsky · web-flow · commit c1d49c8b402b · 2023-06-22T11:22:10.000-04:00
mismatched quotes should not cause an infinite loop
diff --git a/jvm/src/test/scala/scala/xml/parsing/ConstructingParserTest.scala b/jvm/src/test/scala/scala/xml/parsing/ConstructingParserTest.scala
@@ -91,4 +91,10 @@ class ConstructingParserTest {
     val parser: ConstructingParser = ConstructingParser.fromSource(Source.fromString(xml), preserveWS = true)
     parser.document().docElem  // shouldn't crash
   }
+
+  @Test(expected = classOf[scala.xml.parsing.FatalError])
+  def issue656(): Unit = {
+    // mismatched quotes should not cause an infinite loop
+    XhtmlParser(Source.fromString("""<html><body myAttribute='value"/></html>"""))
+  }
 }
diff --git a/shared/src/main/scala/scala/xml/parsing/MarkupParserCommon.scala b/shared/src/main/scala/scala/xml/parsing/MarkupParserCommon.scala
@@ -67,7 +67,7 @@ private[scala] trait MarkupParserCommon extends TokenTests {
     val buf: StringBuilder = new StringBuilder
     while (ch != endCh && !eof) {
       // well-formedness constraint
-      if (ch == '<') reportSyntaxError("'<' not allowed in attrib value")
+      if (ch == '<') truncatedError("'<' not allowed in attrib value")
       else if (ch == SU) truncatedError("")
       else buf.append(ch_returning_nextch)
     }

Original file line number	Diff line number	Diff line change
`@@ -91,4 +91,10 @@ class ConstructingParserTest {`
`91`	`91`	`val parser: ConstructingParser = ConstructingParser.fromSource(Source.fromString(xml), preserveWS = true)`
`92`	`92`	`parser.document().docElem // shouldn't crash`
`93`	`93`	`}`
	`94`	`+`
	`95`	`+ @Test(expected = classOf[scala.xml.parsing.FatalError])`
	`96`	`+ def issue656(): Unit = {`
	`97`	`+ // mismatched quotes should not cause an infinite loop`
	`98`	`+ XhtmlParser(Source.fromString("""<html><body myAttribute='value"/></html>"""))`
	`99`	`+ }`
`94`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ private[scala] trait MarkupParserCommon extends TokenTests {`
`67`	`67`	`val buf: StringBuilder = new StringBuilder`
`68`	`68`	`while (ch != endCh && !eof) {`
`69`	`69`	`// well-formedness constraint`
`70`		`- if (ch == '<') reportSyntaxError("'<' not allowed in attrib value")`
	`70`	`+ if (ch == '<') truncatedError("'<' not allowed in attrib value")`
`71`	`71`	`else if (ch == SU) truncatedError("")`
`72`	`72`	`else buf.append(ch_returning_nextch)`
`73`	`73`	`}`