Fix '<' or '>' in DTD comment throwing an error. (#533)

* comment unimplemented methods * update package for release * Add test * Make DocTypeReader not try to parse a tag if the '^<' is in a comment * Remove error, don't decrement angleBracketCount if '^>' is in a comment and not an end tag * Remove new line from xml string definition Co-authored-by: amit kumar gupta <[email protected]>
NaturalIntelligence · Jan 25, 2023 · 30624d7 · 30624d7
1 parent 59eb905
commit 30624d7
Show file tree

Hide file tree

Showing 13 changed files with 57 additions and 53 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 Note: If you find missing information about particular minor version, that version must have been changed without any functional change in this library.
 
+**4.0.13 / 2023-01-07**
+* preserveorder formatting (By [mdeknowis](https://github.com/mdeknowis))
+* support `transformAttributeName` (By [Erik Rothoff Andersson](https://github.com/erkie))
+
 **4.0.12 / 2022-11-19**
 * fix typescript
 

diff --git a/lib/fxbuilder.min.js b/lib/fxbuilder.min.js
diff --git a/lib/fxbuilder.min.js.map b/lib/fxbuilder.min.js.map
diff --git a/lib/fxp.min.js b/lib/fxp.min.js
diff --git a/lib/fxp.min.js.map b/lib/fxp.min.js.map
diff --git a/lib/fxparser.min.js b/lib/fxparser.min.js
diff --git a/lib/fxparser.min.js.map b/lib/fxparser.min.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fast-xml-parser",
-  "version": "4.0.12",
+  "version": "4.0.13",
   "description": "Validate XML, Parse XML, Build XML without C/C++ based libraries",
   "main": "./src/fxp.js",
   "scripts": {

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/xmlbuilder/json2xml.js b/src/xmlbuilder/json2xml.js
@@ -31,8 +31,8 @@ const defaultOptions = {
   ],
   processEntities: true,
   stopNodes: [],
-  transformTagName: false,
-  transformAttributeName: false,
+  // transformTagName: false,
+  // transformAttributeName: false,
 };
 
 function Builder(options) {

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;
                 }