Don't escape entities in CDATA sections (#633)

NaturalIntelligence · Jan 19, 2024 · 92e07cb · 92e07cb
1 parent 291fe73
commit 92e07cb
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/spec/cdata_spec.js b/spec/cdata_spec.js
@@ -446,4 +446,20 @@ patronymic</person></root>`;
         // console.log(JSON.stringify(result,null,4));
         expect(result).toEqual(expected);
     });
+
+    it("should not process entities in CDATA", function() {
+        const xmlData =`<xml><![CDATA[&lt;text&gt;]]></xml>`;
+
+        const expected = { xml: '&lt;text&gt;' };
+
+        const options = {
+            ignoreAttributes: false,
+        };
+
+        const parser = new XMLParser(options);
+        let result = parser.parse(xmlData);
+
+        // console.log(JSON.stringify(result,null,4));
+        expect(result).toEqual(expected);
+    });
 });
diff --git a/spec/entities_spec.js b/spec/entities_spec.js
@@ -27,7 +27,7 @@ describe("XMLParser Entities", function() {
                 "a:b": 2,
                 "a-b:b-a": 2,
                 "a:c": "test&\nтест<\ntest",
-                "a:el": "<a><<a/><b>2</b>]]]]>&a",
+                "a:el": "<a>&lt;<a/>&lt;b&gt;2</b>]]]]>&amp;a",
                 "c:string": {
                     "#text": "&#x441;&#x442;&#x440;&#x430;&#x445;&#x43e;&#x432;&#x430;&#x43d;&#x438;&#x44f;    » &#x43e;&#x442; &#x441;&#x443;&#x43c;&#x43c;&#x44b;     &#x435;&#x433;&#x43e; &#x430;&#x43a;&#x442;&#x438;&#x432;&#x43e;&#x432;",
                     "@_lang": "ru"

diff --git a/src/xmlparser/OrderedObjParser.js b/src/xmlparser/OrderedObjParser.js
@@ -265,14 +265,13 @@ const parseXml = function(xmlData) {
 
         textData = this.saveTextToParentTag(textData, currentNode, jPath);
 
+        let val = this.parseTextData(tagExp, currentNode.tagname, jPath, true, false, true, true);
+        if(val == undefined) val = "";
+
         //cdata should be set even if it is 0 length string
         if(this.options.cdataPropName){
-          // let val = this.parseTextData(tagExp, this.options.cdataPropName, jPath + "." + this.options.cdataPropName, true, false, true);
-          // if(!val) val = "";
           currentNode.add(this.options.cdataPropName, [ { [this.options.textNodeName] : tagExp } ]);
         }else{
-          let val = this.parseTextData(tagExp, currentNode.tagname, jPath, true, false, true);
-          if(val == undefined) val = "";
           currentNode.add(this.options.textNodeName, val);
         }