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

mismatched quotes should not cause an infinite loop
scala · Jun 22, 2023 · c1d49c8 · c1d49c8
2 parents 7aebf85 + 671428d
commit c1d49c8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
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)
     }