fix: doctype with entities handling

PR-URL: #272 Credit: @SethFalco Close: #272 Reviewed-by: @isaacs
isaacs · May 27, 2024 · 968b53c · 968b53c
1 parent 5d10b0a
commit 968b53c
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 16 deletions.
diff --git a/lib/sax.js b/lib/sax.js
@@ -1103,12 +1103,11 @@
             continue;
           }
 
-          if (parser.doctype && parser.doctype !== true) {
-            parser.sgmlDecl += c
-            continue;
-          }
-
-          if ((parser.sgmlDecl + c).toUpperCase() === CDATA) {
+          if (parser.doctype && parser.doctype !== true && parser.sgmlDecl) {
+            parser.state = S.DOCTYPE_DTD
+            parser.doctype += '<!' + parser.sgmlDecl + c
+            parser.sgmlDecl = ''
+          } else if ((parser.sgmlDecl + c).toUpperCase() === CDATA) {
             emitNode(parser, 'onopencdata')
             parser.state = S.CDATA
             parser.sgmlDecl = ''
@@ -1176,6 +1175,8 @@
             parser.doctype += c
             parser.state = S.DOCTYPE_DTD_QUOTED
             parser.q = c
+          } else {
+            parser.doctype += c
           }
           continue
 

diff --git a/test/doctype-with-comment.js b/test/doctype-with-comment.js
diff --git a/test/doctypes.js b/test/doctypes.js
@@ -0,0 +1,45 @@
+// with entity
+require(__dirname).test({
+  xml: '<!DOCTYPE svg [ <!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/"> ]><svg></svg>',
+  expect: [
+    [ 'doctype', ' svg [ <!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/"> ]' ],
+    [ 'opentagstart', { name: 'SVG', attributes: {} } ],
+    [ 'opentag', { name: 'SVG', attributes: {}, isSelfClosing: false } ],
+    [ 'closetag', 'SVG' ],
+  ]
+})
+
+// with comment
+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' ],
+  ]
+})
+
+// with entity and comment
+require(__dirname).test({
+  xml: '<!DOCTYPE svg [<!--comment with \' and ] symbols--> <!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/"> ]><svg></svg>',
+  expect: [
+    [ 'comment', 'comment with \' and ] symbols' ],
+    [ 'doctype', ' svg [ <!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/"> ]' ],
+    [ 'opentagstart', { name: 'SVG', attributes: {} } ],
+    [ 'opentag', { name: 'SVG', attributes: {}, isSelfClosing: false } ],
+    [ 'closetag', 'SVG' ],
+  ]
+})
+
+// with empty doctype
+require(__dirname).test({
+  xml: '<!DOCTYPE svg []><svg></svg>',
+  expect: [
+    [ 'doctype', ' svg []' ],
+    [ 'opentagstart', { name: 'SVG', attributes: {} } ],
+    [ 'opentag', { name: 'SVG', attributes: {}, isSelfClosing: false } ],
+    [ 'closetag', 'SVG' ],
+  ]
+})