fix: don't throw on comment in dtd

PR-URL: #267 Credit: @SethFalco Close: #267 Reviewed-by: @isaacs
isaacs · May 27, 2024 · 8e8fa71 · 8e8fa71
1 parent 93a63dd
commit 8e8fa71
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 5 deletions.
diff --git a/lib/sax.js b/lib/sax.js
@@ -1090,15 +1090,23 @@
           continue
 
         case S.SGML_DECL:
+          if (parser.sgmlDecl + c === '--') {
+            parser.state = S.COMMENT
+            parser.comment = ''
+            parser.sgmlDecl = ''
+            continue;
+          }
+
+          if (parser.doctype && parser.doctype !== true) {
+            parser.sgmlDecl += c
+            continue;
+          }
+
           if ((parser.sgmlDecl + c).toUpperCase() === CDATA) {
             emitNode(parser, 'onopencdata')
             parser.state = S.CDATA
             parser.sgmlDecl = ''
             parser.cdata = ''
-          } else if (parser.sgmlDecl + c === '--') {
-            parser.state = S.COMMENT
-            parser.comment = ''
-            parser.sgmlDecl = ''
           } else if ((parser.sgmlDecl + c).toUpperCase() === DOCTYPE) {
             parser.state = S.DOCTYPE
             if (parser.doctype || parser.sawRoot) {
@@ -1152,10 +1160,14 @@
           continue
 
         case S.DOCTYPE_DTD:
-          parser.doctype += c
           if (c === ']') {
+            parser.doctype += c
             parser.state = S.DOCTYPE
+          } else if (c === '<') {
+            parser.state = S.OPEN_WAKA
+            parser.startTagPosition = parser.position
           } else if (isQuote(c)) {
+            parser.doctype += c
             parser.state = S.DOCTYPE_DTD_QUOTED
             parser.q = c
           }
@@ -1198,6 +1210,8 @@
             // which is a comment of " blah -- bloo "
             parser.comment += '--' + c
             parser.state = S.COMMENT
+          } else if (parser.doctype && parser.doctype !== true) {
+            parser.state = S.DOCTYPE_DTD
           } else {
             parser.state = S.TEXT
           }

diff --git a/test/doctype-with-comment.js b/test/doctype-with-comment.js
@@ -0,0 +1,10 @@
+require(__dirname).test({
+  xml: '<!DOCTYPE svg [<!--comment with \' and ] symbols-->]><svg></svg>',
+  expect: [
+    [ 'comment', 'comment with \' and ] symbols' ],
+    [ 'doctype', ' svg []' ],
+    [ 'opentagstart', { name: 'SVG', attributes: {} } ],
+    [ 'opentag', { name: 'SVG', attributes: {}, isSelfClosing: false } ],
+    [ 'closetag', 'SVG' ],
+  ]
+})