fix: detect unclosed tags in fragments

rubensworks · Jan 16, 2019 · 5642f36 · 5642f36
1 parent fafa29b
commit 5642f36
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 3 deletions.
diff --git a/lib/saxes.js b/lib/saxes.js
@@ -1586,8 +1586,10 @@ class SaxesParser {
     if (!this.sawRoot) {
       this.fail("document must contain a root element.");
     }
-    if (this.sawRoot && !this.closedRoot) {
-      this.fail("unclosed root tag.");
+    const { tags } = this;
+    while (tags.length > 0) {
+      const tag = tags.pop();
+      this.fail(`unclosed tag: ${tag.name}`);
     }
     if ((this.state !== S_BEGIN_WHITESPACE) &&
         (this.state !== S_TEXT)) {

diff --git a/test/fragments.js b/test/fragments.js
@@ -146,6 +146,60 @@ describe("fragments", () => {
     },
   });
 
+  // This case was added to check for a bug in the parsing logic that prevented
+  // detecting if an element was not closed.
+  test({
+    name: "unclosed tag",
+    xml: "Something <blah>1</blah><more>2",
+    expect: [
+      ["text", "Something "],
+      ["opentagstart", {
+        name: "blah",
+        attributes: {},
+        ns: {},
+      }],
+      ["opentag", {
+        name: "blah",
+        local: "blah",
+        prefix: "",
+        uri: "",
+        attributes: {},
+        ns: {},
+        isSelfClosing: false,
+      }],
+      ["text", "1"],
+      ["closetag", {
+        name: "blah",
+        local: "blah",
+        prefix: "",
+        uri: "",
+        attributes: {},
+        ns: {},
+        isSelfClosing: false,
+      }],
+      ["opentagstart", {
+        name: "more",
+        attributes: {},
+        ns: {},
+      }],
+      ["opentag", {
+        name: "more",
+        local: "more",
+        prefix: "",
+        uri: "",
+        attributes: {},
+        ns: {},
+        isSelfClosing: false,
+      }],
+      ["error", "undefined:1:31: unclosed tag: more"],
+      ["text", "2"],
+    ],
+    opt: {
+      xmlns: true,
+      fragment: true,
+    },
+  });
+
   test({
     name: "namespaces",
     xml: "Something <foo:blah>1</foo:blah> something",

diff --git a/test/unclosed-root.js b/test/unclosed-root.js
@@ -21,7 +21,7 @@ require(".").test({
     ],
     [
       "error",
-      "undefined:1:6: unclosed root tag.",
+      "undefined:1:6: unclosed tag: root",
     ],
   ],
   opt: {},