Merge branch 'dev'

# Conflicts: # CHANGELOG.md # lib/fxp.min.js # lib/fxp.min.js.map # lib/fxparser.min.js # lib/fxparser.min.js.map # package-lock.json # package.json
NaturalIntelligence · Feb 2, 2023 · ed962e0 · ed962e0
2 parents c959d13 + 30624d7
commit ed962e0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/spec/entities_spec.js b/spec/entities_spec.js
@@ -128,6 +128,13 @@ describe("XMLParser Entities", function() {
         expect(result).toEqual(expected);
     });
 
+    it("should not throw error when DTD comments contain '<' or '>'", function() {
+        const xmlData = `<!DOCTYPE greeting [<!-- < > < -->]>`;
+
+        const parser = new XMLParser();
+        parser.parse(xmlData);
+    });
+
     it("should parse attributes having '>' in value", function() {
         const xmlData = `
         <?xml version="1.0" encoding="UTF-8"?>
@@ -525,4 +532,4 @@ describe("XMLParser External Entites", function() {
 
         expect(result).toEqual(expected);
     });
-});
+});
diff --git a/src/xmlparser/DocTypeReader.js b/src/xmlparser/DocTypeReader.js
@@ -14,7 +14,7 @@ function readDocType(xmlData, i){
         let hasBody = false, entity = false, comment = false;
         let exp = "";
         for(;i<xmlData.length;i++){
-            if (xmlData[i] === '<') {
+            if (xmlData[i] === '<' && !comment) {
                 if( hasBody && 
                      xmlData[i+1] === '!' &&
                      xmlData[i+2] === 'E' &&
@@ -78,14 +78,15 @@ function readDocType(xmlData, i){
                 if(comment){
                     if( xmlData[i - 1] === "-" && xmlData[i - 2] === "-"){
                         comment = false;
-                    }else{
-                        throw new Error(`Invalid XML comment in DOCTYPE`);
+                        angleBracketsCount--;
                     }
-                }else if(entity){
-                    parseEntityExp(exp, entities);
-                    entity = false;
+                }else{
+                    if(entity) {
+                        parseEntityExp(exp, entities);
+                        entity = false;
+                    }
+                    angleBracketsCount--;
                 }
-                angleBracketsCount--;
                 if (angleBracketsCount === 0) {
                   break;
                 }